summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9f910cc)
Also adjust save-config, grml-autoconfig and docs/tests for
the new directory.
LC_ALL=C
[[ $UID != 0 ]] && runas='sudo' # important for /etc
LC_ALL=C
[[ $UID != 0 ]] && runas='sudo' # important for /etc
- if [ -d /live/overlay ] ; then
+ if [ -d /lib/live/mount/overlay ] ; then # since around December 2012
+ CHANGE_DIR='/lib/live/mount/overlay'
+ if [ -d /live/overlay ] ; then # until around December 2012
CHANGE_DIR='/live/overlay'
elif [ -d /live/image ] ; then # old version
CHANGE_DIR='/live/image'
else
CHANGE_DIR='/live/overlay'
elif [ -d /live/image ] ; then # old version
CHANGE_DIR='/live/image'
else
- echo "Error: no overlay directories found (neither /live/overlay nor /live/image)." >&2
+ echo "Error: no overlay directories found (like /lib/live/mount/overlay or /live/overlay)." >&2
As you probably know you can adjust boot parameters on the bootprompt. You want
to set some boot parameters permanently? That's possible via adding a directory
named 'bootparams' to the Grml ISO which has to be located at the root-directory
As you probably know you can adjust boot parameters on the bootprompt. You want
to set some boot parameters permanently? That's possible via adding a directory
named 'bootparams' to the Grml ISO which has to be located at the root-directory
-/bootparams/ (note: the directory is known as /live/image/bootparams/ on a
+/bootparams/ (note: the directory is known as /lib/live/mount/medium/bootparams/ on a
_running_ Grml system then). Place a textfile inside the directory containing
the boot parameters which should be appended to default ones (this corresponds
to booting without any special parameters).
_running_ Grml system then). Place a textfile inside the directory containing
the boot parameters which should be appended to default ones (this corresponds
to booting without any special parameters).
mkdir debs/ && cp foobar.deb debs/
mkdir debs/ && cp foobar.deb debs/
-Notice: This directory will be located in /live/image after burning the second
+Notice: This directory will be located in /lib/live/mount/medium after burning the second
session.
Now create the second session containing this directory:
session.
Now create the second session containing this directory:
As you probably know you can adjust boot parameters on the bootprompt. You want
to set some boot parameters permanently? That's possible via adding a directory
named 'bootparams' to the Grml ISO which has to be located at the root-directory
As you probably know you can adjust boot parameters on the bootprompt. You want
to set some boot parameters permanently? That's possible via adding a directory
named 'bootparams' to the Grml ISO which has to be located at the root-directory
-/bootparams/ (note: the directory is known as /live/image/bootparams/ on a
+/bootparams/ (note: the directory is known as /lib/live/mount/medium/bootparams/ on a
_running_ Grml system then). Place a textfile inside the directory containing
the boot parameters which should be appended to default ones (this corresponds
to booting without any special parameters).
_running_ Grml system then). Place a textfile inside the directory containing
the boot parameters which should be appended to default ones (this corresponds
to booting without any special parameters).
# update /etc/mtab if running in live-initramfs mode:
if [ -z "$INSTALLED" -a -e /live/cow ] ; then
if ! grep -q rootfs /etc/mtab ; then
# update /etc/mtab if running in live-initramfs mode:
if [ -z "$INSTALLED" -a -e /live/cow ] ; then
if ! grep -q rootfs /etc/mtab ; then
- for i in rootfs "none /sys sysfs" proc /live/image /live/cow /lib/init/rw /dev/shm /dev/pts ; do
+ for i in rootfs "none /sys sysfs" proc ${LIVECD_PATH} /live/cow /lib/init/rw /dev/shm /dev/pts ; do
grep $i /proc/mounts | grep -v /dev/.static >> /etc/mtab
done
fi
grep $i /proc/mounts | grep -v /dev/.static >> /etc/mtab
done
fi
# set only if not already set
if [ -z "$CMDLINE" ] ; then
CMDLINE="$(cat /proc/cmdline)"
# set only if not already set
if [ -z "$CMDLINE" ] ; then
CMDLINE="$(cat /proc/cmdline)"
- [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
- [ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/*)"
+ [ -d ${LIVECD_PATH}/bootparams/ ] && CMDLINE="$CMDLINE $(cat ${LIVECD_PATH}/bootparams/*)"
fi
einfo "Bootoption debug detected. Printing kernel command line:"
echo "$CMDLINE"
fi
einfo "Bootoption debug detected. Printing kernel command line:"
echo "$CMDLINE"
- EXPECTED_PATH='/live/image'
+ EXPECTED_PATH='/lib/live/mount/medium'
config_finddcsdir &>/dev/null
config_finddcsdir &>/dev/null