projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding 3.0.0-1 changelog entries.
[live-boot-grml.git]
/
backends
/
initramfs-tools
/
live.hook
diff --git
a/backends/initramfs-tools/live.hook
b/backends/initramfs-tools/live.hook
index
df1a86c
..
d66c669
100755
(executable)
--- a/
backends/initramfs-tools/live.hook
+++ b/
backends/initramfs-tools/live.hook
@@
-6,19
+6,15
@@
set -e
[ "${QUIET}" ] || echo -n "live-boot:"
[ "${QUIET}" ] || echo -n "live-boot:"
-# Reading configuration files
-if [ -e /etc/live/boot.conf ]
-then
- . /etc/live/boot.conf
-fi
-
-if ls /etc/live/boot.d/*.conf > /dev/null 2>&1
-then
- for _FILE in /etc/live/boot.d/*.conf
- do
- . ${_FILE}
- done
-fi
+# Reading configuration file from filesystem and live-media
+for _FILE in /etc/live/boot.conf /etc/live/boot/* \
+ /lib/live/mount/media/live/boot.conf /lib/live/mount/media/live/boot/*
+do
+ if [ -e "${_FILE}" ]
+ then
+ . "${_FILE}"
+ fi
+done
# Checking live-boot
if [ ! -e /lib/live/boot ]
# Checking live-boot
if [ ! -e /lib/live/boot ]
@@
-46,11
+42,7
@@
done
# udev dependencies
for FILE in /lib/udev/*_id
do
# udev dependencies
for FILE in /lib/udev/*_id
do
- if [ ! -e "${DESTDIR}/${FILE}" ]
- then
- mkdir -p "${DESTDIR}/lib/udev"
- copy_exec "${FILE}" /lib/udev
- fi
+ copy_exec "${FILE}"
done
# wheezy/sid
done
# wheezy/sid
@@
-65,7
+57,7
@@
fi
# Configuration: keymap (usefull when using encryption)
if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
then
# Configuration: keymap (usefull when using encryption)
if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
then
- copy_exec /bin/loadkeys
/bin
+ copy_exec /bin/loadkeys
mkdir -p "${DESTDIR}"/etc
cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
mkdir -p "${DESTDIR}"/etc
cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
@@
-84,7
+76,7
@@
manual_add_modules btrfs
# Filesystem: cifs
if [ -x /sbin/mount.cifs ]
then
# Filesystem: cifs
if [ -x /sbin/mount.cifs ]
then
- copy_exec /sbin/mount.cifs
/sbin
+ copy_exec /sbin/mount.cifs
manual_add_modules cifs
fi
manual_add_modules cifs
fi
@@
-92,6
+84,10
@@
fi
manual_add_modules ext3
manual_add_modules ext4
manual_add_modules ext3
manual_add_modules ext4
+# Filesystem: hfs/hfsplus
+manual_add_modules hfs
+manual_add_modules hfsplus
+
# Filesystem: jffs2
manual_add_modules jffs2
# Filesystem: jffs2
manual_add_modules jffs2
@@
-101,7
+97,7
@@
then
fi
# Filesystem: squashfs
fi
# Filesystem: squashfs
-copy_exec /sbin/losetup
/sbin
+copy_exec /sbin/losetup
manual_add_modules loop
manual_add_modules squashfs
manual_add_modules sqlzma
manual_add_modules loop
manual_add_modules squashfs
manual_add_modules sqlzma
@@
-147,11
+143,19
@@
then
copy_exec /usr/bin/eject /bin
fi
copy_exec /usr/bin/eject /bin
fi
+# Program: mount
+# fuse does not work with klibc mount
+copy_exec /bin/mount /bin/mount.util-linux
+
[ "${QUIET}" ] || echo -n " utils"
# Feature: Verify Checksums
[ "${QUIET}" ] || echo -n " utils"
# Feature: Verify Checksums
-copy_exec /usr/bin/sha256sum /bin
-copy_exec /usr/bin/md5sum /bin
+if [ -e /etc/progress-linux_version ]
+then
+ copy_exec /usr/bin/sha256sum /bin
+else
+ copy_exec /usr/bin/md5sum /bin
+fi
# Program: memdisk
if [ -x /usr/bin/memdiskfind ]
# Program: memdisk
if [ -x /usr/bin/memdiskfind ]
@@
-166,7
+170,7
@@
fi
if [ -x /sbin/udevadm ]
then
[ "${QUIET}" ] || echo -n " udev"
if [ -x /sbin/udevadm ]
then
[ "${QUIET}" ] || echo -n " udev"
- copy_exec /sbin/udevadm
/sbin
+ copy_exec /sbin/udevadm
fi
if [ -x /usr/bin/udevinfo ]
then
fi
if [ -x /usr/bin/udevinfo ]
then
@@
-185,7
+189,7
@@
fi
if [ -x /sbin/blockdev ]
then
[ "${QUIET}" ] || echo -n " blockdev"
if [ -x /sbin/blockdev ]
then
[ "${QUIET}" ] || echo -n " blockdev"
- copy_exec /sbin/blockdev
/sbin
+ copy_exec /sbin/blockdev
fi
# FUSE kernel module
fi
# FUSE kernel module
@@
-240,14
+244,4
@@
case "${LIVE_DNS}" in
;;
esac
;;
esac
-case "${LIVE_UNIONMOUNT}" in
- true)
- [ "${QUIET}" ] || echo -n " unionmount"
-
- # UnionMount
- # only mount from patched util-linux can do this currently
- copy_exec /bin/mount /bin/mount_full
- ;;
-esac
-
[ "${QUIET}" ] || echo .
[ "${QUIET}" ] || echo .