projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update changelog for release 3.0~b10-1+grml.1
[live-boot-grml.git]
/
scripts
/
boot
/
9990-main.sh
diff --git
a/scripts/boot/9990-main.sh
b/scripts/boot/9990-main.sh
index
2cf1d7e
..
c696781
100755
(executable)
--- a/
scripts/boot/9990-main.sh
+++ b/
scripts/boot/9990-main.sh
@@
-27,6
+27,17
@@
Main ()
Select_eth_device
Select_eth_device
+ if [ -e /conf/param.conf ]
+ then
+ . /conf/param.conf
+ fi
+
+ if [ -n "${FUSE_MOUNT}" ]
+ then
+ # fuse does not work with klibc mount
+ ln -f /bin/mount.util-linux /bin/mount
+ fi
+
# Needed here too because some things (*cough* udev *cough*)
# changes the timeout
# Needed here too because some things (*cough* udev *cough*)
# changes the timeout
@@
-127,7
+138,7
@@
Main ()
if [ -n "${ROOT_PID}" ]
then
if [ -n "${ROOT_PID}" ]
then
- echo "${ROOT_PID}" > "${rootmnt}"/live/root.pid
+ echo "${ROOT_PID}" > "${rootmnt}"/li
b/li
ve/root.pid
fi
log_end_msg
fi
log_end_msg
@@
-141,11
+152,8
@@
Main ()
esac
# Move to the new root filesystem so that programs there can get at it.
esac
# Move to the new root filesystem so that programs there can get at it.
- if [ ! -d /root/live/image ]
- then
- mkdir -p /root/live/image
- mount --move /live/image /root/live/image
- fi
+ mkdir -p /root/lib/live/mount/medium
+ mount --move /live/medium /root/lib/live/mount/medium
# aufs2 in kernel versions around 2.6.33 has a regression:
# directories can't be accessed when read for the first the time,
# aufs2 in kernel versions around 2.6.33 has a regression:
# directories can't be accessed when read for the first the time,
@@
-154,10
+162,10
@@
Main ()
ls /root/* >/dev/null 2>&1
# Move findiso directory to the new root filesystem so that programs there can get at it.
ls /root/* >/dev/null 2>&1
# Move findiso directory to the new root filesystem so that programs there can get at it.
- if [ -d /live/findiso ]
&& [ ! -d /root/live/findiso ]
+ if [ -d /live/findiso ]
then
then
- mkdir -p /root/li
ve
/findiso
- mount -n --move /live/findiso /root/li
ve
/findiso
+ mkdir -p /root/li
b/live/mount
/findiso
+ mount -n --move /live/findiso /root/li
b/live/mount
/findiso
fi
# if we do not unmount the ISO we can't run "fsck /dev/ice" later on
fi
# if we do not unmount the ISO we can't run "fsck /dev/ice" later on
@@
-167,10
+175,10
@@
Main ()
then
losetup -d /dev/loop0
then
losetup -d /dev/loop0
- if is_mountpoint /root/li
ve
/findiso
+ if is_mountpoint /root/li
b/live/mount
/findiso
then
then
- umount /root/li
ve
/findiso
- rmdir --ignore-fail-on-non-empty /root/li
ve
/findiso \
+ umount /root/li
b/live/mount
/findiso
+ rmdir --ignore-fail-on-non-empty /root/li
b/live/mount
/findiso \
>/dev/null 2>&1 || true
fi
fi
>/dev/null 2>&1 || true
fi
fi