diff options
author | Juergen Daubert <jue@jue.li> | 2009-06-03 11:43:24 +0200 |
---|---|---|
committer | Juergen Daubert <jue@jue.li> | 2009-06-03 11:43:24 +0200 |
commit | 7266f994f7f11c4cbe0c885f2c601a403491d089 (patch) | |
tree | 17d1ab3b6d9568cf583a43545508c4642d2c5d82 /initramfs | |
parent | 97bd195228edef04dd4dcbb7cc7376f93d9bc16d (diff) | |
parent | bacfba2ce5dd17debca937e7fc2a42acd9bed3d3 (diff) | |
download | iso-7266f994f7f11c4cbe0c885f2c601a403491d089.tar.gz iso-7266f994f7f11c4cbe0c885f2c601a403491d089.tar.xz |
Merge branch '2.5' into 2.6
Diffstat (limited to 'initramfs')
-rwxr-xr-x | initramfs/init | 10 | ||||
-rw-r--r-- | initramfs/initramfs.lst | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/initramfs/init b/initramfs/init index f2c66d5..9d3a2a8 100755 --- a/initramfs/init +++ b/initramfs/init @@ -111,11 +111,11 @@ find_and_mount_cdrom() { checkReturn rmdir /.tmpfs/.squashfs - # even though the CDROM gets unmounted here, it gets remounted after - # the new init starts, so the message might be confusing... - #echo -e -n " ${BOLD}${BLUE}*${NORM} Unmounting CDROM... " - umount -l /.tmpfs/.cdrom - #checkReturn + # disassociate the loopback device associated with the squashfs filesystem + /bin/losetup -d /dev/loop0 + + # the cdrom gets unmounted here and remounted after switch_root + umount /.tmpfs/.cdrom rmdir /.tmpfs/.cdrom echo -e -n " ${BOLD}${BLUE}*${NORM} Unmounting tmpfs... " diff --git a/initramfs/initramfs.lst b/initramfs/initramfs.lst index 5df159b..36139c0 100644 --- a/initramfs/initramfs.lst +++ b/initramfs/initramfs.lst @@ -34,6 +34,7 @@ slink /bin/sleep busybox 777 0 0 slink /bin/cat busybox 777 0 0 slink /bin/dmesg busybox 777 0 0 slink /bin/ls busybox 777 0 0 +slink /bin/losetup busybox 777 0 0 # module directories dir /lib 755 0 0 |