New Installer based on dracut hw-detection (uClibc removed).
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 11 Aug 2010 15:23:41 +0000 (17:23 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 11 Aug 2010 15:23:41 +0000 (17:23 +0200)
52 files changed:
config/install/halt
config/install/inittab [deleted file]
config/install/rc [deleted file]
config/install/rc_installer [new file with mode: 0644]
config/install/udev/rules.d/05-udev-early.rules [deleted file]
config/install/udev/rules.d/23-usb.rules [deleted file]
config/install/udev/rules.d/25-lfs.rules [deleted file]
config/install/udev/rules.d/26-modprobe.rules [deleted file]
config/install/udev/rules.d/27-firmware.rules [deleted file]
config/install/udev/rules.d/50-udev.rules [deleted file]
config/install/udev/rules.d/60-persistent-storage.rules [deleted file]
config/install/udev/rules.d/81-cdrom.rules [deleted file]
config/install/udev/udev.conf [deleted file]
config/rootfiles/common/dracut
config/rootfiles/common/initscripts
config/rootfiles/core/40/filelists/compat-wireless [deleted file]
config/rootfiles/core/40/filelists/files
config/rootfiles/installer/coreutils [new symlink]
config/rootfiles/installer/e2fsprogs [new symlink]
config/rootfiles/installer/gawk [new symlink]
config/rootfiles/installer/glibc [new symlink]
config/rootfiles/installer/grep [new symlink]
config/rootfiles/installer/hwdata [new symlink]
config/rootfiles/installer/kbd [new symlink]
config/rootfiles/installer/kudzu [new symlink]
config/rootfiles/installer/misc-progs [new file with mode: 0644]
config/rootfiles/installer/mtd [new symlink]
config/rootfiles/installer/ncurses [new symlink]
config/rootfiles/installer/newt [new symlink]
config/rootfiles/installer/pciutils [new symlink]
config/rootfiles/installer/pcmciautils [new symlink]
config/rootfiles/installer/popt [new symlink]
config/rootfiles/installer/reboot [new file with mode: 0644]
config/rootfiles/installer/reiserfsprogs [new symlink]
config/rootfiles/installer/sed [new symlink]
config/rootfiles/installer/slang [new symlink]
config/rootfiles/installer/sysfsutils [new symlink]
config/rootfiles/installer/tar [new symlink]
config/rootfiles/installer/util-linux [new symlink]
config/rootfiles/installer/vim [new symlink]
config/rootfiles/installer/xz [new symlink]
config/rootfiles/installer/zlib [new symlink]
doc/packages-list.txt
lfs/flash-images
lfs/initrd
lfs/initscripts
lfs/installer
make.sh
src/dracut/dracut.conf
src/initscripts/init.d/firstsetup [new file with mode: 0644]
src/install+setup/install/main.c
src/patches/dracut-init_start_ipfireinstaller.patch [new file with mode: 0644]

index 666c27c..1518f7d 100644 (file)
@@ -1,13 +1,12 @@
 #!/bin/sh
 # Clear screen
-/bin/clear
-
+/usr/bin/clear
 echo "Shutting down..."
 echo "Sending all processes the TERM signal..."
-/bin/killall5 -15
+/sbin/killall5 -15
 sleep 3
 echo "Sending all processes the KILL signal..."
-/bin/killall5 -9
+/sbin/killall5 -9
 sleep 3
 echo "Unmounting filesystems"
 /bin/umount /tmp
@@ -18,4 +17,4 @@ echo "Unmounting filesystems"
 /bin/umount /proc
 echo "Unmounting root"
 /bin/mount -n -o remount,ro /
-/bin/reboot
+/sbin/reboot -f
diff --git a/config/install/inittab b/config/install/inittab
deleted file mode 100644 (file)
index 6a16041..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# System initialization.
-::sysinit:/etc/rc
-
-# Run gettys in standard runlevels
-console::respawn:/bin/iowrap /dev/console /bin/ash --login -c "/bin/install /dev/tty2"
-tty2::respawn:/bin/iowrap /dev/tty2 /bin/ash --login
-tty3::respawn:/bin/iowrap /dev/tty3 /bin/ash --login
-
-# Stuff to do before rebooting
-::ctrlaltdel:/etc/halt
-::shutdown:/etc/halt
diff --git a/config/install/rc b/config/install/rc
deleted file mode 100644 (file)
index ba1da5e..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/ash
-
-echo -n "Mounting filesystems: /tmp "
-mount -n -t tmpfs tmpfs /tmp -o mode=1777
-
-echo -n "/proc "
-mount -n -t proc none /proc
-echo >/proc/sys/kernel/printk "1 4 1 7"
-
-echo -n "/sys "
-mount -n -t sysfs sysfs /sys
-
-echo -n "/dev "
-mount -n -t tmpfs tmpfs /dev -o mode=755
-mkdir -p -m 0755 /dev/pts
-mkdir -p -m 0755 /dev/shm
-
-echo -n "/dev/pts "
-mount -n -t devpts devpts /dev/pts
-
-echo "/root"
-mount -n -t ramfs none /root
-
-echo -n -e "\033[9;0]"
-
-ln -snf /proc/self/fd /dev/fd
-ln -snf /proc/self/fd/0 /dev/stdin
-ln -snf /proc/self/fd/1 /dev/stdout
-ln -snf /proc/self/fd/2 /dev/stderr
-ln -s /proc/kcore /dev/core
-
-echo "Starting syslogd"
-syslogd -O /dev/tty4
-
-echo "Loading scsi_mod & libata module"
-modprobe scsi_mod
-modprobe libata
-
-echo "Starting udev daemon"
-/sbin/udevd --daemon
-/sbin/udevadm trigger
-/sbin/udevadm settle
-
-sleep 3
-for file in /dev/.udev/failed/*/uevent ; do
-       echo "add" >"${file}"
-done 2>/dev/null
-/sbin/udevadm settle
-
-echo "Loading Installer..."
diff --git a/config/install/rc_installer b/config/install/rc_installer
new file mode 100644 (file)
index 0000000..0c3ec09
--- /dev/null
@@ -0,0 +1,20 @@
+#
+# IPFire Installer RC
+#
+
+echo >/proc/sys/kernel/printk "1 4 1 7"
+echo -n -e "\033[9;0]"
+
+ln -snf /proc/self/fd/0 /dev/stdin
+ln -snf /proc/self/fd/1 /dev/stdout
+ln -snf /proc/self/fd/2 /dev/stderr
+ln -s /proc/kcore /dev/core
+
+echo "Starting shells on tty2 and tty3 ..."
+/usr/local/bin/iowrap /dev/tty2 /bin/bash &
+/usr/local/bin/iowrap /dev/tty3 /bin/bash &
+
+echo "Loading Installer..."
+/bin/bash --login -c "/bin/install /dev/tty2"
+
+/etc/halt
diff --git a/config/install/udev/rules.d/05-udev-early.rules b/config/install/udev/rules.d/05-udev-early.rules
deleted file mode 100644 (file)
index cd5d9f5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# sysfs is populated after the event is sent
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
diff --git a/config/install/udev/rules.d/23-usb.rules b/config/install/udev/rules.d/23-usb.rules
deleted file mode 100644 (file)
index fa02c43..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set group ownership for raw USB devices
-SUBSYSTEM=="usb_device", GROUP="usb"
diff --git a/config/install/udev/rules.d/25-lfs.rules b/config/install/udev/rules.d/25-lfs.rules
deleted file mode 100644 (file)
index ea79b77..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-# /etc/udev/rules.d/25-lfs.rules: Rule definitions for LFS.
-
-# Core kernel devices
-
-KERNEL=="ptmx",     MODE="0666",    GROUP="tty"
-KERNEL=="random",   MODE="0444"
-KERNEL=="urandom",  MODE="0444"
-KERNEL=="kmem",     MODE="0640",    GROUP="kmem"
-KERNEL=="mem",      MODE="0640",    GROUP="kmem"
-KERNEL=="port",     MODE="0640",    GROUP="kmem"
-KERNEL=="null",     MODE="0666"
-KERNEL=="zero",     MODE="0666"
-KERNEL=="full",     MODE="0666"
-KERNEL=="aio",      MODE="0444"
-KERNEL=="kmsg",     MODE="0600"
-KERNEL=="rtc",      MODE="0666"
-
-# Comms devices
-
-KERNEL=="ttyS[0-9]*",                   GROUP="dialout"
-KERNEL=="ttyUSB[0-9]*",                 GROUP="dialout"
-KERNEL=="rfcomm[0-9]*",                 GROUP="dialout"
-KERNEL=="tty[BCDEFHILMPRSTUVWX][0-9]*", GROUP="dialout"
-KERNEL=="ttyS[ACIR][0-9]*",             GROUP="dialout"
-KERNEL=="ttyUSB[0-9]*",                 GROUP="dialout"
-KERNEL=="ttyACM[0-9]*",                 GROUP="dialout"
-KERNEL=="ippp[0-9]*",                   GROUP="dialout"
-KERNEL=="isdn[0-9]*",                   GROUP="dialout"
-KERNEL=="isdnctrl[0-9]*",               GROUP="dialout"
-KERNEL=="capi",                         NAME="capi20",  SYMLINK="isdn/capi20"
-KERNEL=="capi?*",                       NAME="capi/%n", GROUP="dialout"
-KERNEL=="dcbri[0-9]*",                  GROUP="dialout"
-KERNEL=="ircomm[0-9]*",                 GROUP="dialout"
-
-# TTY's
-
-KERNEL=="tty",          MODE="0666",    GROUP="tty"
-KERNEL=="tty[0-9]*",    MODE="0666",    GROUP="tty"
-KERNEL=="vcs*",         MODE="0600"
-KERNEL=="console",      MODE="0622",    GROUP="tty"
-
-# ALSA devices go in their own subdirectory
-
-KERNEL=="controlC[0-9]*",   GROUP="audio",  NAME="snd/%k"
-KERNEL=="hw[CD0-9]*",       GROUP="audio",  NAME="snd/%k"
-KERNEL=="pcm[CD0-9cp]*",    GROUP="audio",  NAME="snd/%k"
-KERNEL=="midiC[D0-9]*",     GROUP="audio",  NAME="snd/%k"
-KERNEL=="timer",            GROUP="audio",  NAME="snd/%k"
-KERNEL=="seq",              GROUP="audio",  NAME="snd/%k"
-
-# Sound devices
-
-KERNEL=="admmidi*",     GROUP="audio"
-KERNEL=="adsp*",        GROUP="audio"
-KERNEL=="aload*",       GROUP="audio"
-KERNEL=="amidi*",       GROUP="audio"
-KERNEL=="amixer*",      GROUP="audio"
-KERNEL=="audio*",       GROUP="audio"
-KERNEL=="dmfm*",        GROUP="audio"
-KERNEL=="dmmidi*",      GROUP="audio"
-KERNEL=="dsp*",         GROUP="audio"
-KERNEL=="midi*",        GROUP="audio"
-KERNEL=="mixer*",       GROUP="audio"
-KERNEL=="music",        GROUP="audio"
-KERNEL=="sequencer*",   GROUP="audio"
-
-# Printing devices
-
-KERNEL=="lp[0-9]*",         GROUP="lp"
-KERNEL=="parport[0-9]*",    GROUP="lp"
-KERNEL=="irlpt[0-9]*",      GROUP="lp"
-
-# Input devices go in their own subdirectory
-
-KERNEL=="mice",     MODE="0644",    NAME="input/%k"    SYMLINK="mouse"
-KERNEL=="mouse*",   MODE="0644",    NAME="input/%k"
-KERNEL=="event*",   MODE="0644",    NAME="input/%k"
-KERNEL=="js*",      MODE="0644",    NAME="input/%k"
-KERNEL=="ts*",      MODE="0644",    NAME="input/%k"
-
-KERNEL=="psaux",    MODE="0644"
-KERNEL=="js",       MODE="0644"
-KERNEL=="djs",      MODE="0644"
-
-# USB devices go in their own subdirectory
-
-SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", NAME="%c"
-KERNEL=="hiddev*",          NAME="usb/%k"
-KERNEL=="auer*",            NAME="usb/%k"
-KERNEL=="legousbtower*",    NAME="usb/%k"
-KERNEL=="dabusb*",          NAME="usb/%k"
-BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp", NAME="usb/%k"
-
-# DRI devices are managed by the X server, so prevent udev from creating them
-
-KERNEL=="card*",    NAME=""
-
-# Video devices
-
-KERNEL=="fb[0-9]*",     MODE="0620",    GROUP="video"
-KERNEL=="agpgart",      GROUP="video"
-KERNEL=="video[0-9]*",  GROUP="video"
-KERNEL=="radio[0-9]*",  GROUP="video"
-KERNEL=="vbi[0-9]*",    GROUP="video"
-KERNEL=="vtx[0-9]*",    GROUP="video"
-
-# Storage/memory devices
-
-KERNEL=="fd[0-9]*",             GROUP="floppy"
-KERNEL=="ram[0-9]*",            GROUP="disk"
-KERNEL=="raw[0-9]*",            GROUP="disk",   NAME="raw/%k"
-KERNEL=="hd*",                  GROUP="disk"
-KERNEL=="sd[a-z]",              GROUP="disk"
-KERNEL=="sd[a-z][0-9]*",        GROUP="disk"
-KERNEL=="sd[a-i][a-z]",         GROUP="disk"
-KERNEL=="sd[a-i][a-z][0-9]*",   GROUP="disk"
-KERNEL=="dasd[0-9]*",           GROUP="disk"
-KERNEL=="loop[0-9]*",           GROUP="disk"
-KERNEL=="md[0-9]*",             GROUP="disk"
-
-# dmsetup and lvm2 related programs create devicemapper devices so we prevent
-# udev from creating them
-
-KERNEL=="dm-*",             OPTIONS+="ignore_device"
-KERNEL=="device-mapper",    OPTIONS+="ignore_device"
-
-KERNEL=="ht[0-9]*",     GROUP="tape"
-KERNEL=="nht[0-9]*",    GROUP="tape"
-KERNEL=="pt[0-9]*",     GROUP="tape"
-KERNEL=="npt[0-9]*",    GROUP="tape"
-KERNEL=="st[0-9]*",     GROUP="tape"
-KERNEL=="nst[0-9]*",    GROUP="tape"
-
-# Network devices
-
-KERNEL=="tun",  NAME="net/%k"
diff --git a/config/install/udev/rules.d/26-modprobe.rules b/config/install/udev/rules.d/26-modprobe.rules
deleted file mode 100644 (file)
index b377a6a..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# /etc/udev/rules.d/26-modprobe.rules: Rules that require modprobe.
-
-# Generic rule to allow loading modular drivers for existing hardware
-
-ACTION=="add", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
-
-# SCSI devices require different modules, dependent on their SYSFS{type}.  All
-# of them require 'sg' though.
-#
-# module name       sysfs types
-# sd                0 (TYPE_DISK), 7 (TYPE_MOD), 14 (TYPE_MOD)
-# st/osst           1 (TYPE_TAPE)
-# sr                4 (TYPE_WORM), 5 (TYPE_ROM)
-
-SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
-SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{type}=="1",      RUN+="/sbin/modprobe st"
-SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{type}=="[45]",   RUN+="/sbin/modprobe sr_mod"
-SUBSYSTEM=="scsi_device", ACTION=="add",                        RUN+="/sbin/modprobe sg"
diff --git a/config/install/udev/rules.d/27-firmware.rules b/config/install/udev/rules.d/27-firmware.rules
deleted file mode 100644 (file)
index 0e70d1a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/udev/rules.d/27-firmware.rules: Load firmware for devices that need it
-
-ACTION=="add", SUBSYSTEM=="firmware", RUN+="firmware.sh"
diff --git a/config/install/udev/rules.d/50-udev.rules b/config/install/udev/rules.d/50-udev.rules
deleted file mode 100644 (file)
index bc8c8bd..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# See the udev.rules.examples file for more examples of how to create rules
-#
-
-# if this is a ide cdrom, name it the default name, and create a symlink to cdrom
-BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom"
-
-# create a symlink named after the device map name
-# note devmap_name comes with extras/multipath
-KERNEL="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
-
-# DRI devices always go into a subdirectory (as per the LSB spec)
-KERNEL="card*", NAME="dri/card%n"
-
-# alsa devices
-KERNEL="controlC[0-9]*", NAME="snd/%k"
-KERNEL="hw[CD0-9]*",     NAME="snd/%k"
-KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k"
-KERNEL="midiC[D0-9]*",   NAME="snd/%k"
-KERNEL="timer",          NAME="snd/%k"
-KERNEL="seq",            NAME="snd/%k"
-
-# input devices
-KERNEL="mice",         NAME="input/%k"
-KERNEL="mouse*",       NAME="input/%k"
-KERNEL="event*",       NAME="input/%k"
-KERNEL="js*",          NAME="input/%k"
-KERNEL="ts*",          NAME="input/%k"
-
-# USB devices
-KERNEL="hiddev*",      NAME="usb/%k"
-KERNEL="auer*",                NAME="usb/%k"
-KERNEL="legousbtower*",        NAME="usb/%k"
-KERNEL="dabusb*",      NAME="usb/%k"
-BUS="usb", KERNEL="lp[0-9]*",  NAME="usb/%k"
-
-# CAPI devices
-KERNEL="capi",         NAME="capi20", SYMLINK="isdn/capi20"
-KERNEL="capi*",                NAME="capi/%n"
-
-# Network devices
-KERNEL="tun",          NAME="net/%k"
-
-# raw devices
-KERNEL="raw[0-9]*",    NAME="raw/%k" 
diff --git a/config/install/udev/rules.d/60-persistent-storage.rules b/config/install/udev/rules.d/60-persistent-storage.rules
deleted file mode 100644 (file)
index 80e7d60..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-# persistent storage links: /dev/{disk,tape}/{by-id,by-uuid,by-label,by-path,by-name}
-# scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare@suse.de>
-
-ACTION!="add", GOTO="persistent_storage_end"
-SUBSYSTEM!="block", GOTO="persistent_storage_end"
-
-# skip rules for inappropriate block devices
-KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_storage_end"
-
-# never access removable ide devices, the drivers are causing event loops on open()
-KERNEL=="hd*[!0-9]", SYSFS{removable}=="1", DRIVER=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
-KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_storage_end"
-
-# for partitions import parent information
-KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
-
-# by-id (hardware serial number)
-KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode"
-KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
-KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
-
-KERNEL=="sd*[!0-9]|sr*|st*", SYSFS{ieee1394_id}=="*", ENV{ID_SERIAL}="$sysfs{ieee1394_id}", ENV{ID_BUS}="ieee1394"
-KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="usb_id -x"
-KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -s %p -d $tempnode"
-KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -a -s %p -d $tempnode"
-KERNEL=="dasd*[!0-9]", IMPORT{program}="dasd_id --export $tempnode"
-KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
-KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
-KERNEL=="st*", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
-
-# by-path (shortest physical path)
-KERNEL=="*[!0-9]|sr*", IMPORT{program}="path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
-KERNEL=="st*", IMPORT{program}="path_id %p", SYMLINK+="tape/by-path/$env{ID_PATH}"
-KERNEL=="sr*|st*", GOTO="persistent_storage_end"
-KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
-
-# by-label/by-uuid (filesystem properties)
-KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="persistent_storage_end"
-IMPORT{program}="vol_id --export $tempnode"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
-
-# BIOS Enhanced Disk Device
-KERNEL=="*[!0-9]", IMPORT{program}="edd_id --export $tempnode"
-KERNEL=="*[!0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}"
-KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n"
-
-
-LABEL="persistent_storage_end"
diff --git a/config/install/udev/rules.d/81-cdrom.rules b/config/install/udev/rules.d/81-cdrom.rules
deleted file mode 100644 (file)
index 5a38a72..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/udev/rules.d/81-cdrom.rules: Set CD-ROM permissions.
-
-ACTION=="add", SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", GROUP="cdrom"
diff --git a/config/install/udev/udev.conf b/config/install/udev/udev.conf
deleted file mode 100644 (file)
index 41902c4..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# udev.conf
-
-# The initial syslog(3) priority: "err", "info", "debug" or its
-# numerical equivalent. For runtime debugging, the daemons internal
-# state can be changed with: "udevcontrol log_priority=<value>".
-udev_log="err"
-
index d140fd9..c427d71 100644 (file)
@@ -1,3 +1,4 @@
+boot/ipfirerd-KVER.img
 etc/dracut.conf
 etc/dracut.conf.d
 sbin/dracut
index 180666f..a43b7f0 100644 (file)
@@ -28,6 +28,7 @@ etc/rc.d/init.d/dnsmasq
 etc/rc.d/init.d/fcron
 #etc/rc.d/init.d/fetchmail
 etc/rc.d/init.d/firewall
+etc/rc.d/init.d/firstsetup
 etc/rc.d/init.d/functions
 #etc/rc.d/init.d/gnump3d
 etc/rc.d/init.d/halt
@@ -178,6 +179,7 @@ etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S70console
+etc/rc.d/rcsysinit.d/S75firstsetup
 etc/rc.d/rcsysinit.d/S80localnet
 etc/rc.d/rcsysinit.d/S90sysctl
 #etc/sysconfig
diff --git a/config/rootfiles/core/40/filelists/compat-wireless b/config/rootfiles/core/40/filelists/compat-wireless
deleted file mode 100644 (file)
index ab7affd..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-lib/modules/2.6.32.15-ipfire/kernel/compat/compat.ko
-lib/modules/2.6.32.15-ipfire/kernel/compat/compat_firmware_class.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/ath3k.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bcm203x.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bfusb.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bpa10x.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btmrvl.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btsdio.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btuart_cs.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btusb.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/dtl1_cs.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/hci_uart.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/hci_vhci.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atl1c/atl1c.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atl1e/atl1e.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atlx/atl1.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atlx/atl2.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/b44.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/asix.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/catc.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc-phonet.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc_eem.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc_ether.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc_subset.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/dm9601.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/gl620a.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/hso.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/int51x1.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/kaweth.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/mcs7830.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/net1080.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/pegasus.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/plusb.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/rndis_host.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/rtl8150.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/smsc95xx.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/usbnet.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/zaurus.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/adm8211.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/at76c50x-usb.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/b43/b43.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ipw2x00/libipw.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/libertas.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/libertas_cs.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/usb8xxx.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/mwl8k.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54common.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rndis_wlan.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/wl12xx/wl1251.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
-lib/modules/2.6.32.15-ipfire/kernel/drivers/ssb/ssb.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/bluetooth.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/bnep/bnep.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/hidp/hidp.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/l2cap.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/sco.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/mac80211/mac80211.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/wireless/cfg80211.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko
-lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/compat/compat.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/compat/compat_firmware_class.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/ath3k.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btusb.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atl1c/atl1c.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atl1e/atl1e.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atlx/atl1.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atlx/atl2.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/b44.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/asix.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/catc.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc-phonet.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/dm9601.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/gl620a.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/hso.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/int51x1.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/kaweth.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/net1080.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/pegasus.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/plusb.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/usbnet.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/zaurus.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/ssb/ssb.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/bluetooth.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/l2cap.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/sco.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/mac80211/mac80211.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/cfg80211.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko
-etc/udev/rules.d/50-compat_firmware.rules
-lib/udev/compat_firmware.sh
index c5ca9a8..34fb931 100644 (file)
@@ -14,5 +14,3 @@ usr/lib/python2.7/site-packages/libxml2.py
 usr/lib/python2.7/site-packages/libxml2mod.so
 usr/lib/python2.7/site-packages/libxml2.pyc
 usr/lib/python2.7/site-packages/libxsltmod.so
-lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/option.ko
-lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/option.ko
diff --git a/config/rootfiles/installer/coreutils b/config/rootfiles/installer/coreutils
new file mode 120000 (symlink)
index 0000000..b41d95a
--- /dev/null
@@ -0,0 +1 @@
+../common/coreutils
\ No newline at end of file
diff --git a/config/rootfiles/installer/e2fsprogs b/config/rootfiles/installer/e2fsprogs
new file mode 120000 (symlink)
index 0000000..2a6ee42
--- /dev/null
@@ -0,0 +1 @@
+../common/e2fsprogs
\ No newline at end of file
diff --git a/config/rootfiles/installer/gawk b/config/rootfiles/installer/gawk
new file mode 120000 (symlink)
index 0000000..a7660cf
--- /dev/null
@@ -0,0 +1 @@
+../common/gawk
\ No newline at end of file
diff --git a/config/rootfiles/installer/glibc b/config/rootfiles/installer/glibc
new file mode 120000 (symlink)
index 0000000..73e445e
--- /dev/null
@@ -0,0 +1 @@
+../common/glibc
\ No newline at end of file
diff --git a/config/rootfiles/installer/grep b/config/rootfiles/installer/grep
new file mode 120000 (symlink)
index 0000000..f7bf2d9
--- /dev/null
@@ -0,0 +1 @@
+../common/grep
\ No newline at end of file
diff --git a/config/rootfiles/installer/hwdata b/config/rootfiles/installer/hwdata
new file mode 120000 (symlink)
index 0000000..7ed7e21
--- /dev/null
@@ -0,0 +1 @@
+../common/hwdata
\ No newline at end of file
diff --git a/config/rootfiles/installer/kbd b/config/rootfiles/installer/kbd
new file mode 120000 (symlink)
index 0000000..3efe86a
--- /dev/null
@@ -0,0 +1 @@
+../common/kbd
\ No newline at end of file
diff --git a/config/rootfiles/installer/kudzu b/config/rootfiles/installer/kudzu
new file mode 120000 (symlink)
index 0000000..da66b91
--- /dev/null
@@ -0,0 +1 @@
+../common/kudzu
\ No newline at end of file
diff --git a/config/rootfiles/installer/misc-progs b/config/rootfiles/installer/misc-progs
new file mode 100644 (file)
index 0000000..ac5e8dd
--- /dev/null
@@ -0,0 +1 @@
+usr/local/bin/iowrap
diff --git a/config/rootfiles/installer/mtd b/config/rootfiles/installer/mtd
new file mode 120000 (symlink)
index 0000000..75bc3db
--- /dev/null
@@ -0,0 +1 @@
+../common/mtd
\ No newline at end of file
diff --git a/config/rootfiles/installer/ncurses b/config/rootfiles/installer/ncurses
new file mode 120000 (symlink)
index 0000000..7aac8a2
--- /dev/null
@@ -0,0 +1 @@
+../common/ncurses
\ No newline at end of file
diff --git a/config/rootfiles/installer/newt b/config/rootfiles/installer/newt
new file mode 120000 (symlink)
index 0000000..b63c480
--- /dev/null
@@ -0,0 +1 @@
+../common/newt
\ No newline at end of file
diff --git a/config/rootfiles/installer/pciutils b/config/rootfiles/installer/pciutils
new file mode 120000 (symlink)
index 0000000..903f124
--- /dev/null
@@ -0,0 +1 @@
+../common/pciutils
\ No newline at end of file
diff --git a/config/rootfiles/installer/pcmciautils b/config/rootfiles/installer/pcmciautils
new file mode 120000 (symlink)
index 0000000..47b2fe8
--- /dev/null
@@ -0,0 +1 @@
+../common/pcmciautils
\ No newline at end of file
diff --git a/config/rootfiles/installer/popt b/config/rootfiles/installer/popt
new file mode 120000 (symlink)
index 0000000..d15b2c6
--- /dev/null
@@ -0,0 +1 @@
+../common/popt
\ No newline at end of file
diff --git a/config/rootfiles/installer/reboot b/config/rootfiles/installer/reboot
new file mode 100644 (file)
index 0000000..f1f6d64
--- /dev/null
@@ -0,0 +1,2 @@
+sbin/reboot
+sbin/halt
diff --git a/config/rootfiles/installer/reiserfsprogs b/config/rootfiles/installer/reiserfsprogs
new file mode 120000 (symlink)
index 0000000..f596f68
--- /dev/null
@@ -0,0 +1 @@
+../common/reiserfsprogs
\ No newline at end of file
diff --git a/config/rootfiles/installer/sed b/config/rootfiles/installer/sed
new file mode 120000 (symlink)
index 0000000..4b0d3a3
--- /dev/null
@@ -0,0 +1 @@
+../common/sed
\ No newline at end of file
diff --git a/config/rootfiles/installer/slang b/config/rootfiles/installer/slang
new file mode 120000 (symlink)
index 0000000..405fd40
--- /dev/null
@@ -0,0 +1 @@
+../common/slang
\ No newline at end of file
diff --git a/config/rootfiles/installer/sysfsutils b/config/rootfiles/installer/sysfsutils
new file mode 120000 (symlink)
index 0000000..9c56a9a
--- /dev/null
@@ -0,0 +1 @@
+../common/sysfsutils
\ No newline at end of file
diff --git a/config/rootfiles/installer/tar b/config/rootfiles/installer/tar
new file mode 120000 (symlink)
index 0000000..f994ef6
--- /dev/null
@@ -0,0 +1 @@
+../common/tar
\ No newline at end of file
diff --git a/config/rootfiles/installer/util-linux b/config/rootfiles/installer/util-linux
new file mode 120000 (symlink)
index 0000000..c8ab83e
--- /dev/null
@@ -0,0 +1 @@
+../common/util-linux
\ No newline at end of file
diff --git a/config/rootfiles/installer/vim b/config/rootfiles/installer/vim
new file mode 120000 (symlink)
index 0000000..3ae92f3
--- /dev/null
@@ -0,0 +1 @@
+../common/vim
\ No newline at end of file
diff --git a/config/rootfiles/installer/xz b/config/rootfiles/installer/xz
new file mode 120000 (symlink)
index 0000000..61772c7
--- /dev/null
@@ -0,0 +1 @@
+../common/xz
\ No newline at end of file
diff --git a/config/rootfiles/installer/zlib b/config/rootfiles/installer/zlib
new file mode 120000 (symlink)
index 0000000..fcdedec
--- /dev/null
@@ -0,0 +1 @@
+../common/zlib
\ No newline at end of file
index 6bd1176..e4fca57 100644 (file)
@@ -37,7 +37,7 @@
 * Unix-Syslog-0.100
 * XML-Parser-2.34
 * alsa-lib-1.0.23
-* alsa-lib-1.0.23-kmod-2.6.32.15-ipfire
+* alsa-lib-1.0.23-kmod-2.6.32.17-ipfire
 * amavisd-new-2.5.2
 * apcupsd-3.14.4
 * applejuice-0.31
@@ -56,7 +56,6 @@
 * bluez-libs-3.36
 * br2684ctl
 * bridge-utils-1.1
-* busybox-1.2.2
 * bwm-ng-0.6
 * bzip2-1.0.5
 * cacti-0.8.7e
 * clamav-0.96.1
 * cmake-2.4.8
 * collectd-4.9.1
-* compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire
-* compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire-xen
+* compat-wireless-2.6.34.1-kmod-2.6.32.17-ipfire
 * coreutils-5.96
 * cpio-2.11
 * cpufrequtils-007
-* cryptodev-20091126-kmod-2.6.32.15-ipfire
-* cryptodev-20091126-kmod-2.6.32.15-ipfire-xen
+* cryptodev-20091126-kmod-2.6.32.17-ipfire
 * cups-1.4.2
 * curl-7.19.5
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
 * dahdi-2.2.1
-* dahdi-2.2.1-kmod-2.6.32.15-ipfire
-* dahdi-2.2.1-kmod-2.6.32.15-ipfire-xen
+* dahdi-2.2.1-kmod-2.6.32.17-ipfire
 * db-4.4.20
 * dbus-1.0.3
 * ddrescue-1.12
 * dnsmasq-2.45
 * dosfstools-3.0.9
 * dracut-006
-* e1000-8.0.19-kmod-2.6.32.15-ipfire
-* e1000-8.0.19-kmod-2.6.32.15-ipfire-xen
-* e1000e-1.1.19-kmod-2.6.32.15-ipfire
-* e1000e-1.1.19-kmod-2.6.32.15-ipfire-xen
+* e1000-8.0.19-kmod-2.6.32.17-ipfire
+* e1000e-1.1.19-kmod-2.6.32.17-ipfire
 * e2fsprogs-1.41.11
 * ebtables-v2.0.8-2
 * ed-0.2
 * joe-3.7
 * jpegsrc.v6b
 * kbd-1.12
-* kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire-xen
+* kqemu-1.4.0pre1-kmod-2.6.32.17-ipfire
 * kudzu-1.2.64
-* kvm-kmod-2.6.33.1-kmod-2.6.32.15-ipfire
 * l7-protocols-2009-05-10
 * lame-3.97
 * lcd4linux-0.10.1-RC2
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.32.15-ipfire
-* linux-2.6.32.15-ipfire-xen
+* linux-2.6.32.17-ipfire
 * linux-atm-2.4.1
 * linux-firmware-20100318
 * linux-libc-headers-2.6.12.0
 * lynis-1.2.9
 * lzo-2.02
 * m4-1.4.4
-* mISDN-20100525-kmod-2.6.32.15-ipfire
-* mISDN-20100525-kmod-2.6.32.15-ipfire-xen
+* mISDN-20100525-kmod-2.6.32.17-ipfire
 * mISDNuser-20100525
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire-xen
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.17-ipfire
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
 * psmisc-22.2
 * qemu-0.11.1-kqemu
 * qemu-0.12.3
-* r8101-1.016.00-kmod-2.6.32.15-ipfire
-* r8101-1.016.00-kmod-2.6.32.15-ipfire-xen
-* r8168-8.018.00-kmod-2.6.32.15-ipfire
-* r8168-8.018.00-kmod-2.6.32.15-ipfire-xen
-* r8169-6.013.00-kmod-2.6.32.15-ipfire
-* r8169-6.013.00-kmod-2.6.32.15-ipfire-xen
+* r8101-1.016.00-kmod-2.6.32.17-ipfire
+* r8168-8.018.00-kmod-2.6.32.17-ipfire
+* r8169-6.013.00-kmod-2.6.32.17-ipfire
 * readline-5.1
 * reiser4progs-1.0.6
 * reiserfsprogs-3.6.21
 * usb-modeswitch-1.1.2
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire
-* v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire-xen
+* v4l-dvb-b576509ea6d2-kmod-2.6.32.17-ipfire
 * vdr-1.6.0
 * vdradmin-am-3.6.7
 * vim-7.0
index dde98cb..dab1b86 100644 (file)
@@ -99,7 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        sed -i -e "s|DEVICE2|#DEVICE2|g" $(MNThdd)/etc/fstab
        sed -i -e "s|DEVICE|/dev/sda|g" $(MNThdd)/etc/fstab
        sed -i -e "s|FSTYPE|ext2|g" $(MNThdd)/etc/fstab
-       chroot $(MNThdd) /usr/local/bin/rebuild-initrd
+#      chroot $(MNThdd) /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER) $(KVER)-ipfire
 
        # Copy grub files manually
        cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/
index cf4f280..eba2670 100644 (file)
@@ -51,50 +51,31 @@ $(TARGET) :
        rm -f /install/images/initrd
 
        # Finish up initrd directory
-       -mkdir -p /install/initrd/{dev,etc,mnt,root,lib/modules/$(KVER)-ipfire/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run,sys} && \
+       -mkdir -p /install/initrd/{dev,etc,mnt,root,lib/modules/$(KVER)-ipfire/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run,sys}
+       cd /install/initrd && lzma -d -c /boot/ipfirerd-$(KVER).img | cpio -i
+
+       # Copy Files packages for installer
+       find $(DIR_SRC)/config/rootfiles/installer/* -maxdepth 1 | xargs cat > /tmp/ROOTFILES
+       -cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES
+
        cd /install/initrd/etc && rm -f fstab
        cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/
        rm -rf /install/initrd/usr/share/man
-       chmod 755 /install/initrd/etc/halt /install/initrd/etc/rc
-       cp -f /usr/share/terminfo/l/linux /install/initrd/usr/share/terminfo/l
+       chmod 755 /install/initrd/etc/halt /install/initrd/etc/rc_installer
+
+       cd /install/initrd/ && patch -Np0 < $(DIR_SRC)/src/patches/dracut-init_start_ipfireinstaller.patch
 
        # make new dependencies 
        depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
-       #depmod -a -F /boot/System.map-$(KVER)-ipfire-smp $(KVER)-ipfire-smp
-       
-       cp -a /lib/modules/$(KVER)-ipfire/ /install/initrd/lib/modules/
-       
-       rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,mISDN,source,misc/*,kernel/{sound,drivers/{acpi,bluetooth,cpufreq,hwmon,gpu,rtc,isdn,media,video,watchdog}}} \
-               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan* \
-               /install/initrd/lib/modules/$(KVER)-ipfire/net/{bridge,netfilter,ipsec} \
-               /install/initrd/lib/modules/$(KVER)-ipfire/dahdi
-
-       # ... acpi/dock.ko is needed for libata
-#      -mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi
-#      cp -a /lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko \
-#              /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko
-
-       cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/
-
-       cd /install/initrd/lib/ && ln -sf libgcc_s.so.1 libgcc_s.so
 
        -mkdir -p /install/{images,mnt}
        rm -rf /install/mnt/*
 
        cp -aR /install/initrd/* /install/mnt
 
-       # make new dependencies for installer
-       depmod -a -F /boot/System.map-$(KVER)-ipfire \
-           -b /install/initrd $(KVER)-ipfire
-
        # Remove binary depmod files
        rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/modules.*.bin
 
-       cd /install/initrd && strip --strip-all {,usr/}{,s}bin/* || true
-       cd /install/initrd && strip --strip-debug {,usr/}lib/* || true
-
-       cd /install/initrd && ln -svf sbin/init init
-
        cd /install/initrd && find . | cpio -o -H newc | lzma > /install/images/initrd
        cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log
 
index a9fadf4..1dbf65d 100644 (file)
@@ -163,6 +163,7 @@ $(TARGET) :
        ln -sf ../init.d/cleanfs     /etc/rc.d/rcsysinit.d/S50cleanfs
        ln -sf ../init.d/setclock    /etc/rc.d/rcsysinit.d/S60setclock
        ln -sf ../init.d/console     /etc/rc.d/rcsysinit.d/S70console
+       ln -sf ../init.d/firstsetup  /etc/rc.d/rcsysinit.d/S75firstsetup
        ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
        ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S90sysctl
        
index 28645cb..dad9200 100644 (file)
@@ -48,6 +48,7 @@ md5 :
 
 $(TARGET) :
        @$(PREBUILD)
+       -mkdir -p /install/initrd/bin
        @rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cp -R $(DIR_SRC)/src/install+setup/* $(DIR_APP)
        for i in $(DIR_SRC)/langs/*/install/lang_*.c ; do \
            cp $$i $(DIR_APP)/libsmooth; \
diff --git a/make.sh b/make.sh
index aaf90b2..15f569b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -342,22 +342,22 @@ buildipfire() {
   ipfiremake which
   ipfiremake xz
   ipfiremake linux-firmware
-  ipfiremake linux                     XEN=1
-  ipfiremake kqemu                     XEN=1
-  ipfiremake v4l-dvb                   XEN=1
-  ipfiremake madwifi                   XEN=1
-  ipfiremake mISDN                     XEN=1
-  ipfiremake dahdi                     XEN=1 KMOD=1
-  ipfiremake cryptodev                 XEN=1
-  ipfiremake compat-wireless           XEN=1
-  ipfiremake r8169                     XEN=1
-  ipfiremake r8168                     XEN=1
-  ipfiremake r8101                     XEN=1
-  ipfiremake e1000                     XEN=1
-  ipfiremake e1000e                    XEN=1
+#  ipfiremake linux                    XEN=1
+#  ipfiremake kqemu                    XEN=1
+#  ipfiremake v4l-dvb                  XEN=1
+#  ipfiremake madwifi                  XEN=1
+#  ipfiremake mISDN                    XEN=1
+#  ipfiremake dahdi                    XEN=1 KMOD=1
+#  ipfiremake cryptodev                        XEN=1
+#  ipfiremake compat-wireless          XEN=1
+#  ipfiremake r8169                    XEN=1
+#  ipfiremake r8168                    XEN=1
+#  ipfiremake r8101                    XEN=1
+#  ipfiremake e1000                    XEN=1
+#  ipfiremake e1000e                   XEN=1
   ipfiremake linux
   ipfiremake kqemu
-  ipfiremake kvm-kmod
+#  ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa                      KMOD=1
@@ -373,6 +373,9 @@ buildipfire() {
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
+
+  installmake strip
+
   ipfiremake dracut
   ipfiremake expat
   ipfiremake gdbm
@@ -664,34 +667,35 @@ buildinstaller() {
   ipfiremake as86
   ipfiremake mbr
   ipfiremake memtest
-  installmake linux-libc-header
-  installmake binutils
-  ipfiremake uClibc                    PASS=1
-  ipfiremake gcc                       INST=1
-  installmake uClibc                   PASS=2
-  installmake gcc                      INST=2
-  installmake uClibc                   PASS=3
-  installmake busybox
-  installmake udev
-  installmake slang
-  installmake newt
-  installmake gettext
-  installmake kbd
-  installmake popt
-  installmake sysvinit
-  installmake misc-progs
-  installmake reiserfsprogs
-  installmake sysfsutils
-  installmake util-linux
-  installmake pciutils
-  installmake zlib
-  installmake mtd
-  installmake wget
-  installmake hwdata
-  installmake kudzu
-  installmake pcmciautils
-  installmake installer
-  installmake initrd
+#  installmake linux-libc-header
+#  installmake binutils
+#  ipfiremake uClibc                   PASS=1
+#  ipfiremake gcc                      INST=1
+#  installmake uClibc                  PASS=2
+#  installmake gcc                     INST=2
+#  installmake uClibc                  PASS=3
+#  ipfiremake busybox
+#  installmake udev
+#  installmake slang
+#  installmake newt
+#  installmake gettext
+#  installmake kbd
+#  installmake popt
+#  installmake sysvinit
+#  installmake misc-progs
+#  installmake reiserfsprogs
+#  installmake sysfsutils
+#  installmake util-linux
+#  installmake pciutils
+#  installmake zlib
+#  installmake mtd
+#  installmake wget
+#  installmake hwdata
+#  installmake kudzu
+#  installmake pcmciautils
+  ipfiremake installer
+  installmake strip
+  ipfiremake initrd
 }
 
 buildpackages() {
@@ -699,7 +703,6 @@ buildpackages() {
   export LOGFILE
   echo "... see detailed log in _build.*.log files" >> $LOGFILE
 
-  installmake strip
   
   # Generating list of packages used
   echo -n "Generating packages list from logs" | tee -a $LOGFILE
index a6c3cb0..a37038e 100644 (file)
@@ -13,7 +13,7 @@
 #add_drivers+=""
 
 # list of kernel filesystem modules to be included in the generic initramfs
-filesystems+="reiser4"
+filesystems+="ext2 ext3 reiserfs reiser4 iso9660 vfat"
 
 # build initrd only to boot current hardware
 #hostonly="yes"
diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup
new file mode 100644 (file)
index 0000000..c3cf427
--- /dev/null
@@ -0,0 +1,22 @@
+#!/bin/bash
+/usr/local/sbin/setup /dev/tty2 INSTALL
+/usr/bin/clear
+echo "Reboot ..."
+echo "Sending all processes the TERM signal..."
+/sbin/killall5 -15
+sleep 3
+echo "Sending all processes the KILL signal..."
+/sbin/killall5 -15
+sleep 3
+echo "Unmounting Filesystems..."
+/bin/umount /sys
+/bin/umount /dev/pts
+/bin/umount /proc
+/bin/umount /boot
+/bin/umount /var/log/rrd
+/bin/umount /var/lock
+/bin/umount /var/run
+/bin/umount /var
+rm -f /etc/rc.d/rcsysinit.d/S75firstsetup \
+&& /bin/mount -n -o remount,ro / \
+&& /sbin/reboot -f
index 2de12bd..ff0b3a2 100644 (file)
@@ -109,24 +109,24 @@ int main(int argc, char *argv[])
        }
 
        // Load ata-piix prior kudzu because kudzu use ata-generic for ich7
-       mysystem("/sbin/modprobe ata_piix");
+//     mysystem("/sbin/modprobe ata_piix");
 
        // Starting hardware detection
-       runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ...");
+//     runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ...");
 
        // Load common modules
-       mysystem("/sbin/modprobe ide-generic");
-       mysystem("/sbin/modprobe ide-cd");
-       mysystem("/sbin/modprobe ide-disk");
-       mysystem("/sbin/modprobe ehci-hcd");
-       mysystem("/sbin/modprobe uhci-hcd");
-       mysystem("/sbin/modprobe ohci-hcd");
-       mysystem("/sbin/modprobe ohci1394");
-       mysystem("/sbin/modprobe sd_mod");
-       mysystem("/sbin/modprobe sr_mod");
-       mysystem("/sbin/modprobe usb-storage");
-       mysystem("/sbin/modprobe usbhid");
-       mysystem("/sbin/modprobe ahci");
+//     mysystem("/sbin/modprobe ide-generic");
+//     mysystem("/sbin/modprobe ide-cd");
+//     mysystem("/sbin/modprobe ide-disk");
+//     mysystem("/sbin/modprobe ehci-hcd");
+//     mysystem("/sbin/modprobe uhci-hcd");
+//     mysystem("/sbin/modprobe ohci-hcd");
+//     mysystem("/sbin/modprobe ohci1394");
+//     mysystem("/sbin/modprobe sd_mod");
+//     mysystem("/sbin/modprobe sr_mod");
+//     mysystem("/sbin/modprobe usb-storage");
+//     mysystem("/sbin/modprobe usbhid");
+//     mysystem("/sbin/modprobe ahci");
 
        mysystem("/sbin/modprobe iso9660"); // CDROM
        mysystem("/sbin/modprobe ext2"); // Boot patition
@@ -288,7 +288,7 @@ int main(int argc, char *argv[])
         * the disk. 
         */
        /* Don't use mysystem here so we can redirect output */
-       sprintf(commandstring, "/bin/sfdisk -s /dev/%s > /tmp/disksize 2> /dev/null", harddrive);
+       sprintf(commandstring, "/sbin/sfdisk -s /dev/%s > /tmp/disksize 2> /dev/null", harddrive);
        system(commandstring);
 
        /* Calculate amount of disk space */
@@ -360,7 +360,7 @@ int main(int argc, char *argv[])
 
        fclose(handle);
 
-       snprintf(commandstring, STRING_SIZE, "/bin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk);
+       snprintf(commandstring, STRING_SIZE, "/sbin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk);
        if (runcommandwithstatus(commandstring, ctr[TR_PARTITIONING_DISK]))
        {
                errorbox(ctr[TR_UNABLE_TO_PARTITION]);
@@ -369,16 +369,16 @@ int main(int argc, char *argv[])
        
        if (fstype == EXT2) {
                mysystem("/sbin/modprobe ext2");
-               sprintf(mkfscommand, "/sbin/mke2fs -T ext2 -c");
+               sprintf(mkfscommand, "/sbin/mke2fs -T ext2");
        } else if (fstype == REISERFS) {
                mysystem("/sbin/modprobe reiserfs");
                sprintf(mkfscommand, "/sbin/mkreiserfs -f");
        } else if (fstype == EXT3) {
                mysystem("/sbin/modprobe ext3");
-               sprintf(mkfscommand, "/sbin/mke2fs -T ext3 -c");
+               sprintf(mkfscommand, "/sbin/mke2fs -T ext3");
        }
 
-       snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -c %s1", hdparams.devnode_part);
+       snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -I 128 %s1", hdparams.devnode_part);
        if (runcommandwithstatus(commandstring, ctr[TR_MAKING_BOOT_FILESYSTEM]))
        {
                errorbox(ctr[TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM]);
@@ -453,11 +453,11 @@ int main(int argc, char *argv[])
        /* Save language und local settings */
        write_lang_configs(shortlangname);
 
-       /* touch the modules.dep files */
-       snprintf(commandstring, STRING_SIZE, 
-               "/bin/touch /harddisk/lib/modules/%s-ipfire/modules.dep",
-               KERNEL_VERSION);
-       mysystem(commandstring);
+//     /* touch the modules.dep files */
+//     snprintf(commandstring, STRING_SIZE, 
+//             "/bin/touch /harddisk/lib/modules/%s-ipfire/modules.dep",
+//             KERNEL_VERSION);
+//     mysystem(commandstring);
 /*     snprintf(commandstring, STRING_SIZE, 
                "/bin/touch /harddisk/lib/modules/%s-ipfire-smp/modules.dep",
                KERNEL_VERSION);
@@ -474,7 +474,7 @@ int main(int argc, char *argv[])
        mysystem("/bin/mount --bind /sys  /harddisk/sys");
 
        /* Build cache lang file */
-       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
+       snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
        if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_LANG_CACHE]))
        {
                errorbox(ctr[TR_UNABLE_TO_INSTALL_LANG_CACHE]);
@@ -491,20 +491,20 @@ int main(int argc, char *argv[])
                replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
        } else if (fstype == EXT3) {
-               snprintf(commandstring, STRING_SIZE, "tune2fs -j %s3", hdparams.devnode_part);
-               if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
-               {
-                       errorbox(ctr[TR_JOURNAL_ERROR]);
-                       replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
-                       goto NOJOURNAL;
-               }
-               snprintf(commandstring, STRING_SIZE, "tune2fs -j %s4", hdparams.devnode_part);
-               if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
-               {
-                       errorbox(ctr[TR_JOURNAL_ERROR]);
-                       replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
-                       goto NOJOURNAL;
-               }
+               //snprintf(commandstring, STRING_SIZE, "tune2fs -j %s3", hdparams.devnode_part);
+               //if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
+               //{
+               //      errorbox(ctr[TR_JOURNAL_ERROR]);
+               //      replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
+               //      goto NOJOURNAL;
+               //}
+               //snprintf(commandstring, STRING_SIZE, "tune2fs -j %s4", hdparams.devnode_part);
+               //if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
+               //{
+               //      errorbox(ctr[TR_JOURNAL_ERROR]);
+               //      replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
+               //      goto NOJOURNAL;
+               //}
                replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
                NOJOURNAL:
                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
@@ -513,9 +513,9 @@ int main(int argc, char *argv[])
        replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
 
        /* Going to make our initrd... */
-       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/local/bin/rebuild-initrd");
+/*     snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/local/bin/rebuild-initrd");
        runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-
+*/
        sprintf(string, "root=%s3", hdparams.devnode_part_run);
        replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
        mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
@@ -523,7 +523,7 @@ int main(int argc, char *argv[])
        system("sed -e 's#/harddisk#/#g' -e 's#//#/#g'  < /proc/mounts > /harddisk/etc/mtab");
 
        snprintf(commandstring, STRING_SIZE, 
-                "/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
+                "/usr/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
        if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_GRUB])) {
                errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
                goto EXIT;
@@ -574,10 +574,10 @@ EXIT:
                fclose(flog);
                newtFinished();
 
-               if (!unattended) {
-                       if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
-                               printf("Unable to run setup.\n");
-               }
+//             if (!unattended) {
+//                     if (system("/usr/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
+//                             printf("Unable to run setup.\n");
+//             }
 
                if (system("/bin/umount /harddisk/proc"))
                        printf("Unable to umount /harddisk/proc.\n"); 
@@ -602,8 +602,9 @@ EXIT:
        system("/bin/umount /harddisk/var");
        system("/bin/umount /harddisk/boot");
        system("/bin/umount /harddisk");
-         
-       system("/etc/halt");
+
+       if (!(allok))
+               system("/etc/halt");
 
        return 0;
 }
diff --git a/src/patches/dracut-init_start_ipfireinstaller.patch b/src/patches/dracut-init_start_ipfireinstaller.patch
new file mode 100644 (file)
index 0000000..0103826
--- /dev/null
@@ -0,0 +1,33 @@
+diff -Naur org/init new/init
+--- init       2010-06-17 10:46:29.000000000 +0200
++++ init       2010-08-10 17:55:41.000000000 +0200
+@@ -111,8 +111,9 @@
+ getarg 'rdbreak=cmdline' && emergency_shell -n cmdline "Break before cmdline"
+ source_all cmdline
+-[ -z "$root" ] && die "No or empty root= argument"
+-[ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
++# Disable root argument check ...
++#[ -z "$root" ] && die "No or empty root= argument"
++#[ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
+ # Network root scripts may need updated root= options,
+ # so deposit them where they can see them (udev purges the env)
+@@ -202,12 +203,15 @@
+     done
+     
+     i=$(($i+1))
+-    [ $i -gt $RDRETRY ] \
+-        && { flock -s 9 ; emergency_shell "No root device found"; } 9>/.console_lock
++      # Start IPFire installer after root was not found ;)
++    [ $i -gt $RDRETRY ] && break 2;
++
+ done
+ unset job
+ unset queuetriggered
++/etc/rc_installer
++
+ # pre-mount happens before we try to mount the root filesystem,
+ # and happens once.
+ getarg 'rdbreak=pre-mount' && emergency_shell -n pre-mount "Break pre-mount"