projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mounting aufs layer with detached inode index, this solves the 'leaving unclean files...
[live-boot-grml.git]
/
debian
/
live-initramfs.init
diff --git
a/debian/live-initramfs.init
b/debian/live-initramfs.init
index
e4e46d5
..
294355d
100644
(file)
--- a/
debian/live-initramfs.init
+++ b/
debian/live-initramfs.init
@@
-85,7
+85,8
@@
device_is_USB_flash_drive()
[ "$(expr substr ${DEVICE} 1 2)" != "sd" ] && return 1
# check that the device is an USB device
[ "$(expr substr ${DEVICE} 1 2)" != "sd" ] && return 1
# check that the device is an USB device
- if readlink /sys/block/${DEVICE}/device | grep -q usb
+ if readlink /sys/block/${DEVICE} | grep -q usb ||
+ readlink /sys/block/${DEVICE}/device | grep -q usb # linux < 2.6.29
then
return 0
fi
then
return 0
fi
@@
-136,6
+137,11
@@
do_stop ()
if [ -z ${QUICKREBOOT} ]
then
if [ -z ${QUICKREBOOT} ]
then
+ # in order to deal with the aufs unmount problem, we do a sync here.
+ sync
+ sleep 1
+ sync
+
# TODO: i18n
BOOT_DEVICE="$(get_boot_device)"
# TODO: i18n
BOOT_DEVICE="$(get_boot_device)"
@@
-155,12
+161,13
@@
do_stop ()
eject -p -m /live/image >/dev/null 2>&1
fi
eject -p -m /live/image >/dev/null 2>&1
fi
- [ "$prompt" ] || return 0
fi
fi
+ [ "$prompt" ] || return 0
+
stty sane < /dev/console
stty sane < /dev/console
-
echo -n -e
"\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
+
printf
"\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
if [ -x /sbin/usplash_write ]
then
if [ -x /sbin/usplash_write ]
then
@@
-191,6
+198,8
@@
case "${1}" in
[ "${VERBOSE}" != no ] && log_end_msg 1
;;
esac
[ "${VERBOSE}" != no ] && log_end_msg 1
;;
esac
+
+ mount -o remount,ro /live/cow
;;
*)
;;
*)