Patchwork [1/1] base-files: remove the unnecessary /media/xxx directories

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date June 28, 2013, 7:48 a.m.
Message ID <046be676719830bf994889ee23db12db1a0ce287.1372386599.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/52525/
State Accepted
Commit 2ed1c03b2459054f0145a77e065b0304bc5da9cb
Headers show

Comments

Qi.Chen@windriver.com - June 28, 2013, 7:48 a.m.
From: Chen Qi <Qi.Chen@windriver.com>

A few directories under /media were created by default, /media/card,
/media/ram, /media/realroot, etc.

These directories actually have no real usage now, thus removing them.

The /media/ram entry in the fstab is also removed, as mounting a tmpfs
over /media/ram in our system brings no benefit.

Note that a duplicate '/mnt' entry in dirs755 are also removed.

[Yocto #4774]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-core/base-files/base-files/fstab     |    1 -
 meta/recipes-core/base-files/base-files_3.0.14.bb |    7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)
Richard Purdie - June 28, 2013, 9:48 a.m.
On Fri, 2013-06-28 at 15:48 +0800, Qi.Chen@windriver.com wrote:
> From: Chen Qi <Qi.Chen@windriver.com>
> 
> A few directories under /media were created by default, /media/card,
> /media/ram, /media/realroot, etc.
> 
> These directories actually have no real usage now, thus removing them.
> 
> The /media/ram entry in the fstab is also removed, as mounting a tmpfs
> over /media/ram in our system brings no benefit.
> 
> Note that a duplicate '/mnt' entry in dirs755 are also removed.
> 
> [Yocto #4774]
> 
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>

Just to be clear, most of these date around 10 years from OpenZaurus and
similar times. We now automount media and there is no real need for
these specific directories or the ramfs. If there is some need in legacy
systems (I did wonder about opie), I'd suggest they get created by them
rather than the core base-files.

Cheers,

Richard

Patch

diff --git a/meta/recipes-core/base-files/base-files/fstab b/meta/recipes-core/base-files/base-files/fstab
index dd613a1..e625ebc 100644
--- a/meta/recipes-core/base-files/base-files/fstab
+++ b/meta/recipes-core/base-files/base-files/fstab
@@ -6,7 +6,6 @@  devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
 usbdevfs             /proc/bus/usb        usbdevfs   noauto                0  0
 tmpfs                /run                 tmpfs      mode=0755,nodev,nosuid,strictatime 0  0
 tmpfs                /var/volatile        tmpfs      defaults              0  0
-tmpfs                /media/ram           tmpfs      defaults              0  0
 
 # uncomment this if your device has a SD/MMC/Transflash slot
 #/dev/mmcblk0p1       /media/card          auto       defaults,sync,noauto  0  0
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 88d1ac9..054fefa 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -43,9 +43,7 @@  dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
            /sys ${localstatedir}/lib/misc ${localstatedir}/spool \
            ${localstatedir}/volatile \
            ${localstatedir}/volatile/log \
-           /mnt /media /media/card /media/cf /media/net /media/ram \
-           /media/union /media/realroot /media/hdd \
-           /media/mmc1"
+           /media"
 dirs3755 = "/srv  \
             ${prefix}/local ${prefix}/local/bin ${prefix}/local/games \
             ${prefix}/local/include ${prefix}/local/lib ${prefix}/local/sbin \
@@ -79,9 +77,6 @@  do_install () {
 	for d in ${volatiles}; do
 		ln -sf volatile/$d ${D}${localstatedir}/$d
 	done
-	for d in card cf net ram; do
-		ln -sf /media/$d ${D}/mnt/$d
-	done
 	ln -snf ../run ${D}${localstatedir}/run
 	ln -snf ../run/lock ${D}${localstatedir}/lock