projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop all floppy related code and documentation
[grml-autoconfig.git]
/
grml-autoconfig
diff --git
a/grml-autoconfig
b/grml-autoconfig
index
7ef820e
..
cd584f2
100755
(executable)
--- a/
grml-autoconfig
+++ b/
grml-autoconfig
@@
-32,7
+32,7
@@
fi
# }}}
# {{{ path, signals, umask, zsh, colors
# }}}
# {{{ path, signals, umask, zsh, colors
-export PATH="/bin:/sbin:/usr/bin:/usr/sbin
:/usr/X11R6/bin
"
+export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
umask 022
# Ignore these signals: INT, TERM, SEGV
trap "" 2 3 11
umask 022
# Ignore these signals: INT, TERM, SEGV
trap "" 2 3 11
@@
-59,7
+59,7
@@
checkvalue $CONFIG_DEBUG && config_debug
# 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
@@
-93,7
+93,7
@@
checkvalue $CONFIG_FIX_PASSWD && config_fix_passwd
checkvalue $CONFIG_HOSTNAME && config_hostname
checkvalue $CONFIG_HOSTNAME && config_hostname
-checkvalue $CONFIG_
USERFSTAB && config_userfstab
+checkvalue $CONFIG_
CONFIGFS && config_configfs
checkvalue $CONFIG_TIME && config_time
checkvalue $CONFIG_TIME && config_time
@@
-116,12
+116,12
@@
checkvalue $CONFIG_LVM && config_lvm
# No kernel messages while probing modules
echo "0" > /proc/sys/kernel/printk
# No kernel messages while probing modules
echo "0" > /proc/sys/kernel/printk
-checkvalue $CONFIG_LOCAL_NET && config_local_net
-
checkvalue $CONFIG_TESTCD && config_testcd
checkvalue $CONFIG_MODULES && config_modules
checkvalue $CONFIG_TESTCD && config_testcd
checkvalue $CONFIG_MODULES && config_modules
+checkvalue $CONFIG_BRLTTY && config_brltty
+
checkvalue $CONFIG_ACPI && config_acpi
checkvalue $CONFIG_DMA && config_dma
checkvalue $CONFIG_ACPI && config_acpi
checkvalue $CONFIG_DMA && config_dma
@@
-152,12
+152,6
@@
checkvalue $CONFIG_FINDDCSDIR && config_umount_dcsdir
checkvalue $CONFIG_PARTCONF && config_partconf
checkvalue $CONFIG_PARTCONF && config_partconf
-# device symlinks {{{
- [ -r /mnt/floppy ] || mkdir /mnt/floppy
- [ -r /mnt/cdrom ] || mkdir /mnt/cdrom
- [ -r /mnt/test ] || mkdir /mnt/test
-# }}}
-
checkvalue $CONFIG_MIXER && config_mixer
checkvalue $CONFIG_MODEM && config_modem
checkvalue $CONFIG_MIXER && config_mixer
checkvalue $CONFIG_MODEM && config_modem
@@
-166,15
+160,19
@@
checkvalue $CONFIG_WONDERSHAPER && config_wondershaper
checkvalue $CONFIG_GPM && config_gpm
checkvalue $CONFIG_GPM && config_gpm
+checkvalue $CONFIG_SERVICES && config_services
+
+checkvalue $CONFIG_DEBNET && config_debnet
+
+checkvalue $CONFIG_DISPLAY_SSH_FINGERPRINTS && config_display_ssh_fingerprints
+
checkvalue $CONFIG_NETCONFIG && config_netconfig
checkvalue $CONFIG_NETSCRIPT && config_netscript
checkvalue $CONFIG_NETCONFIG && config_netconfig
checkvalue $CONFIG_NETSCRIPT && config_netscript
-checkvalue $CONFIG_SERVICES && config_services
-
checkvalue $CONFIG_NETIPV6 && config_ipv6
checkvalue $CONFIG_NETIPV6 && config_ipv6
-checkvalue $CONFIG_
DEBNET && config_debnet
+checkvalue $CONFIG_
STATS && config_stats
checkvalue $CONFIG_CONSOLE && config_console
checkvalue $CONFIG_CONSOLE && config_console
@@
-205,8
+203,7
@@
if [ -n "$BOOTDEBUG" ] ; then
# 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"