summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-01-29 12:12:07 +0100
committer Eric Hameleers <alien@slackware.com>2016-01-29 12:12:07 +0100
commitcfa6a93ac53b64d1f2b1ecd3e25ca9303fa456ee (patch)
tree361fee4084af6240d8a6278a80375a38b3dfb349
parent5b6d1c68663854d271c7f7b271aa174d7c652625 (diff)
downloadliveslak-cfa6a93ac53b64d1f2b1ecd3e25ca9303fa456ee.tar.gz
liveslak-cfa6a93ac53b64d1f2b1ecd3e25ca9303fa456ee.tar.xz
Get rid of udev errors about obex-check-device on boot.
The mkinitrd script adds /lib/udev/rules.d/60-openobex.rules to the initrd image, but since the rest of the openobex package is not added, this results in a "error: obex-check-device not found". We do not need bluetooth stuff in the initrd anyway, so we remove the rules file manually from the initrd until mkinitrd gets fixed.
Diffstat (limited to '')
-rwxr-xr-xmake_slackware_live.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 1d9d7ef..a9827c6 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1333,6 +1333,7 @@ KVER=$(ls --indicator-style=none ${LIVE_ROOTDIR}/lib/modules/ |head -1)
# Create an initrd for the generic kernel, using a modified init script:
echo "-- Creating initrd for kernel-generic $KVER ..."
chroot ${LIVE_ROOTDIR} /sbin/mkinitrd -c -w ${WAIT} -l us -o /boot/initrd_${KVER}.gz -k ${KVER} -m ${KMODS} -L -C dummy 1>${DBGOUT} 2>${DBGOUT}
+# Modify the initrd content for the Live OS:
cat $LIVE_TOOLDIR/liveinit | sed \
-e "s/@LIVEMAIN@/$LIVEMAIN/g" \
-e "s/@MEDIALABEL@/$MEDIALABEL/g" \
@@ -1340,6 +1341,9 @@ cat $LIVE_TOOLDIR/liveinit | sed \
-e "s/@DARKSTAR@/$LIVE_HOSTNAME/g" \
> ${LIVE_ROOTDIR}/boot/initrd-tree/init
cat /dev/null > ${LIVE_ROOTDIR}/boot/initrd-tree/luksdev
+# We do not add openobex to the initrd and don't want to see irrelevant errors:
+rm ${LIVE_ROOTDIR}/boot/initrd-tree/lib/udev/rules.d/*openobex*rules 2>${DBGOUT}
+# Wrap up the initrd.img again:
chroot ${LIVE_ROOTDIR} /sbin/mkinitrd 1>/dev/null 2>${DBGOUT}
rm -rf ${LIVE_ROOTDIR}/boot/initrd-tree