projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't replace busybox's wget by the true wget
[live-boot-grml.git]
/
backend
/
initramfs-tools
/
live.hook
diff --git
a/backend/initramfs-tools/live.hook
b/backend/initramfs-tools/live.hook
index
8b763b2
..
068d98e
100755
(executable)
--- a/
backend/initramfs-tools/live.hook
+++ b/
backend/initramfs-tools/live.hook
@@
-28,7
+28,7
@@
fi
[ "${QUIET}" ] || echo -n " core"
mkdir -p "${DESTDIR}/bin"
[ "${QUIET}" ] || echo -n " core"
mkdir -p "${DESTDIR}/bin"
-cp -a /bin/live-boot
/lib/live/boot
"${DESTDIR}/bin"
+cp -a /bin/live-boot "${DESTDIR}/bin"
mkdir -p "${DESTDIR}/lib/live"
cp -a /lib/live/boot "${DESTDIR}/lib/live"
mkdir -p "${DESTDIR}/lib/live"
cp -a /lib/live/boot "${DESTDIR}/lib/live"
@@
-38,7
+38,10
@@
if [ -e /etc/live/boot.conf ]
then
cp -a /etc/live/boot.conf "${DESTDIR}/etc/live"
fi
then
cp -a /etc/live/boot.conf "${DESTDIR}/etc/live"
fi
-cp -a /etc/live/boot "${DESTDIR}/etc/live"
+if [ -e /etc/live/boot ]
+then
+ cp -a /etc/live/boot "${DESTDIR}/etc/live"
+fi
# klibc dependencies
for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
# klibc dependencies
for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
@@
-120,6
+123,7
@@
manual_add_modules overlay
manual_add_modules nls_cp437
manual_add_modules nls_iso8859-1
manual_add_modules nls_utf8
manual_add_modules nls_cp437
manual_add_modules nls_iso8859-1
manual_add_modules nls_utf8
+manual_add_modules nls_ascii
manual_add_modules vfat
# Filesystem: ntfs
manual_add_modules vfat
# Filesystem: ntfs
@@
-169,17
+173,10
@@
then
fi
# Program: udev
fi
# Program: udev
-if [ -x /
s
bin/udevadm ]
+if [ -x /bin/udevadm ]
then
[ "${QUIET}" ] || echo -n " udev"
then
[ "${QUIET}" ] || echo -n " udev"
- copy_exec /sbin/udevadm
-fi
-
-# Program: wget
-if [ -x /usr/bin/wget ]
-then
- [ "${QUIET}" ] || echo -n " wget"
- copy_exec /usr/bin/wget /bin
+ copy_exec /bin/udevadm
fi
# Program: blockdev
fi
# Program: blockdev