Browse Source

* cleaned early target by avoiding to mount new tmpfs filesystems because rootfs

is already a tmpfs.


git-svn-id: svn://svn.opensde.net/opensde/opensde/trunk@21402 10447126-35f2-4685-b0cf-6dd780d3921f
misl/sde-wrapper
Alejandro Mery 17 years ago
parent
commit
bc34567506
2 changed files with 5 additions and 19 deletions
  1. +3
    -0
      target/early/build-initramfs.in
  2. +2
    -19
      target/early/initrd/init.exec

+ 3
- 0
target/early/build-initramfs.in

@ -19,12 +19,15 @@ ln -s . ${initrddir}/usr
# don't break /tmp when flattening
INITRD_FLIST_PATTERN="$INITRD_FLIST_PATTERN -e '/ usr\/tmp/d;'"
INITRD_FLIST_PATTERN="$INITRD_FLIST_PATTERN -e '/ lib\/udev\/devices/d;'"
INITRD_EMPTY_PATTERN="-e '/\.\/rootfs/d;'"
initrd_flist_install_filter() {
local root="build/${SDECFG_ID}/"
case "$1" in
udev) cp -a "$root/lib/udev/devices"/* "$initrddir/dev/"
return 0 ;;
hotplug2)
cp "$root/sbin/hotplug2-modwrap" "$initrddir/sbin/"
;;

+ 2
- 19
target/early/initrd/init.exec

@ -41,17 +41,11 @@ done
banner "Starting Early User Space environment"
title "Mounting /dev, /proc, /tmp and /sys"
check mount -n -t tmpfs none /dev
title "Mounting /proc and /sys"
check mount -n -t usbfs none /proc/bus/usb
check mount -n -t tmpfs none /tmp
check mount -n -t sysfs none /sys
status
title "Populating /dev"
check cp -a /lib/udev/devices/* /dev
status
[ -x /bin/dmesg ] && /bin/dmesg -n 3
title "Starting udev daemon"
@ -103,22 +97,11 @@ while [ ! -x "/rootfs$initrd" ]; do
setsid /bin/sh < /dev/vc/1 > /dev/vc/1 2> /dev/vc1
done
title "Stopping udev daemon"
title "Cleaning up"
check killall udevd
status
if [ ! -e /rootfs/dev/console ]; then
title "Injecting /dev/console"
check cp -a /dev/console /rootfs/dev/console
status
fi
title "Cleaning the room"
check umount /sys
check umount /tmp
check umount /proc/bus/usb
check umount /proc
check umount /dev
status
exec switch_root /rootfs "$initrd" "$initargs"

Loading…
Cancel
Save