From: Arne Fitzenreiter Date: Thu, 19 Aug 2010 12:49:57 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~102 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0b1d3e68d50513e0b119b455b652d80727060af0;hp=7829d1d0195d99cdb30790909d9edf25ec0e40da Merge branch 'master' into next Conflicts: config/rootfiles/core/40/filelists/files config/rootfiles/core/40/update.sh --- diff --git a/config/etc/group b/config/etc/group index 6c53c1489d..3b155fa889 100644 --- a/config/etc/group +++ b/config/etc/group @@ -39,4 +39,9 @@ clamav:x:109: amavis:x:110: mldonkey:x:111: audio:x:112: +video:x:113: +asterisk:x:114: +nut:x:115: +cdrom:x:116: +usb:x:117: samba:x:1000: diff --git a/config/etc/passwd b/config/etc/passwd index 4b56ac6d0b..ebc82d55cc 100644 --- a/config/etc/passwd +++ b/config/etc/passwd @@ -22,4 +22,5 @@ amavis:x:110:110:Amavisd-new user:/var/amavis: cyrus:x:111:12:Cyrus user:/usr/cyrus: filter:x:112:12:Spam user:/home/filter:/bin/false mldonkey:x:113:111:Mldonkey user:/opt/mldonkey:/bin/false +asterisk:x:114:114:Asterisk user:/var/empty:/bin/false samba:x:1000:1000:Samba User:/var/empty:/bin/false diff --git a/config/grub/grub.conf b/config/grub/grub.conf index b4e279669b..c3f2ebddf8 100644 --- a/config/grub/grub.conf +++ b/config/grub/grub.conf @@ -39,8 +39,3 @@ title IPFire (single Processor) kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 nosmp MOUNT initrd /ipfirerd-KVER.img savedefault 5 -title IPFire (all storage drivers) - root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT - initrd /ipfirerd-KVER-emergency.img - savedefault 6 diff --git a/config/install/halt b/config/install/halt index 666c27c649..90a0c80fe7 100644 --- a/config/install/halt +++ b/config/install/halt @@ -1,21 +1,16 @@ #!/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 -/bin/umount /sys -/bin/umount /dev/pts -/bin/umount /dev -/bin/umount /root -/bin/umount /proc -echo "Unmounting root" +echo "Unmounting filesystems..." +/bin/umount -a > /dev/null 2>&1 +echo "Unmounting root..." /bin/mount -n -o remount,ro / -/bin/reboot +echo "Rebooting..." +/sbin/reboot -f diff --git a/config/install/inittab b/config/install/inittab deleted file mode 100644 index 6a16041e4d..0000000000 --- a/config/install/inittab +++ /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 index dd1fc1d4a4..0000000000 --- a/config/install/rc +++ /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/udevtrigger -/sbin/udevsettle - -sleep 3 -for file in /dev/.udev/failed/*/uevent ; do - echo "add" >"${file}" -done 2>/dev/null -/sbin/udevsettle - -echo "Loading Installer..." diff --git a/config/install/rc_installer b/config/install/rc_installer new file mode 100644 index 0000000000..0c3ec09b66 --- /dev/null +++ b/config/install/rc_installer @@ -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 index cd5d9f563a..0000000000 --- a/config/install/udev/rules.d/05-udev-early.rules +++ /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 index fa02c43fa3..0000000000 --- a/config/install/udev/rules.d/23-usb.rules +++ /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 index ea79b773c8..0000000000 --- a/config/install/udev/rules.d/25-lfs.rules +++ /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 index b377a6aec3..0000000000 --- a/config/install/udev/rules.d/26-modprobe.rules +++ /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 index 0e70d1a4a1..0000000000 --- a/config/install/udev/rules.d/27-firmware.rules +++ /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 index bc8c8bdd6c..0000000000 --- a/config/install/udev/rules.d/50-udev.rules +++ /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 index 80e7d6084e..0000000000 --- a/config/install/udev/rules.d/60-persistent-storage.rules +++ /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 - -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 index 5a38a72101..0000000000 --- a/config/install/udev/rules.d/81-cdrom.rules +++ /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 index 41902c4f06..0000000000 --- a/config/install/udev/udev.conf +++ /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=". -udev_log="err" - diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 2657d14cf2..03033493dd 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.11 -# Sun Apr 18 15:29:55 2010 +# Linux kernel version: 2.6.32.18 +# Sat Aug 14 21:21:26 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -140,9 +140,10 @@ CONFIG_HAVE_PERF_EVENTS=y # CONFIG_PERF_COUNTERS is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y -CONFIG_COMPAT_BRK=y -CONFIG_SLAB=y -# CONFIG_SLUB is not set +CONFIG_SLUB_DEBUG=y +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y # CONFIG_SLOB is not set # CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y @@ -306,6 +307,7 @@ CONFIG_HIGHMEM=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -932,6 +934,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_MINSTREL=y # CONFIG_MAC80211_RC_DEFAULT_PID is not set CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y @@ -1117,90 +1120,7 @@ CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y CONFIG_HAVE_IDE=y -CONFIG_IDE=y - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_ATAPI=y -CONFIG_IDE_LEGACY=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -# CONFIG_IDE_GD_ATAPI is not set -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_DELKIN=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -# CONFIG_BLK_DEV_IDETAPE is not set -CONFIG_BLK_DEV_IDEACPI=y -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=m -CONFIG_BLK_DEV_PLATFORM=m -CONFIG_BLK_DEV_CMD640=m -CONFIG_BLK_DEV_CMD640_ENHANCED=y -CONFIG_BLK_DEV_IDEPNP=m -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_PCIBUS_ORDER=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m -CONFIG_BLK_DEV_OPTI621=m -CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_AEC62XX=m -CONFIG_BLK_DEV_ALI15X3=m -CONFIG_BLK_DEV_AMD74XX=m -CONFIG_BLK_DEV_ATIIXP=m -CONFIG_BLK_DEV_CMD64X=m -CONFIG_BLK_DEV_TRIFLEX=m -CONFIG_BLK_DEV_CS5520=m -CONFIG_BLK_DEV_CS5530=m -CONFIG_BLK_DEV_CS5535=m -CONFIG_BLK_DEV_CS5536=m -CONFIG_BLK_DEV_HPT366=m -CONFIG_BLK_DEV_JMICRON=m -CONFIG_BLK_DEV_SC1200=m -CONFIG_BLK_DEV_PIIX=m -CONFIG_BLK_DEV_IT8172=m -CONFIG_BLK_DEV_IT8213=m -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=m -CONFIG_BLK_DEV_PDC202XX_NEW=m -CONFIG_BLK_DEV_SVWKS=m -CONFIG_BLK_DEV_SIIMAGE=m -CONFIG_BLK_DEV_SIS5513=m -CONFIG_BLK_DEV_SLC90E66=m -CONFIG_BLK_DEV_TRM290=m -CONFIG_BLK_DEV_VIA82CXXX=m -CONFIG_BLK_DEV_TC86C001=m - -# -# Other IDE chipsets support -# - -# -# Note: most of these also require special kernel boot parameters -# -# CONFIG_BLK_DEV_4DRIVES is not set -CONFIG_BLK_DEV_ALI14XX=m -CONFIG_BLK_DEV_DTC2278=m -CONFIG_BLK_DEV_HT6560B=m -CONFIG_BLK_DEV_QD65XX=m -CONFIG_BLK_DEV_UMC8672=m -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDE is not set # # SCSI device support @@ -1486,17 +1406,7 @@ CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m -CONFIG_IEEE1394=m -CONFIG_IEEE1394_OHCI1394=m -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_SBP2=m -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set -CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y -CONFIG_IEEE1394_ETH1394=m -CONFIG_IEEE1394_RAWIO=m -CONFIG_IEEE1394_VIDEO1394=m -# CONFIG_IEEE1394_DV1394 is not set -# CONFIG_IEEE1394_VERBOSEDEBUG is not set +# CONFIG_IEEE1394 is not set # CONFIG_I2O is not set # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y @@ -2740,11 +2650,6 @@ CONFIG_DVB_CAPTURE_DRIVERS=y # # CONFIG_DVB_DM1105 is not set -# -# Supported FireWire (IEEE 1394) Adapters -# -# CONFIG_DVB_FIREDTV is not set - # # Supported Earthsoft PT1 Adapters # @@ -3360,7 +3265,6 @@ CONFIG_LEDS_BD2802=m # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -3808,11 +3712,13 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set -# CONFIG_STRIP_ASM_SYMS is not set -CONFIG_UNUSED_SYMBOLS=y +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set +# CONFIG_SLUB_DEBUG_ON is not set +CONFIG_SLUB_STATS=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_ARCH_WANT_FRAME_POINTERS=y diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index 0b1bbcd9db..9dc576bb38 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.11 -# Mon Apr 19 11:38:34 2010 +# Linux kernel version: 2.6.32.18 +# Sat Aug 14 21:05:53 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -49,8 +49,6 @@ CONFIG_X86_NO_TSS=y CONFIG_X86_NO_IDT=y CONFIG_X86_32_LAZY_GS=y CONFIG_KTIME_SCALAR=y -CONFIG_SUSE_KERNEL=y -# CONFIG_KERNEL_DESKTOP is not set CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y @@ -132,11 +130,11 @@ CONFIG_AIO=y # CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y -CONFIG_COMPAT_BRK=y -CONFIG_SLAB=y -# CONFIG_SLUB is not set +CONFIG_SLUB_DEBUG=y +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y # CONFIG_SLOB is not set -CONFIG_DEFAULT_VM_DIRTY_RATIO=40 # CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set @@ -163,7 +161,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_STOP_MACHINE=y -# CONFIG_UTRACE is not set CONFIG_BLOCK=y CONFIG_LBDAF=y # CONFIG_BLK_DEV_BSG is not set @@ -219,10 +216,10 @@ CONFIG_M586TSC=y # CONFIG_GENERIC_CPU is not set CONFIG_X86_GENERIC=y CONFIG_X86_CPU=y -CONFIG_X86_L1_CACHE_BYTES=128 -CONFIG_X86_INTERNODE_CACHE_BYTES=128 +CONFIG_X86_L1_CACHE_BYTES=64 +CONFIG_X86_INTERNODE_CACHE_BYTES=64 CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=7 +CONFIG_X86_L1_CACHE_SHIFT=5 CONFIG_X86_XADD=y # CONFIG_X86_PPRO_FENCE is not set CONFIG_X86_WP_WORKS_OK=y @@ -263,6 +260,7 @@ CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y CONFIG_X86_PAE=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -279,13 +277,10 @@ CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -# CONFIG_PRECACHE is not set -# CONFIG_PRESWAP is not set # CONFIG_HIGHPTE is not set CONFIG_MTRR=y # CONFIG_X86_PAT is not set CONFIG_SECCOMP=y -# CONFIG_SECCOMP_DISABLE_TSC is not set # CONFIG_CC_STACKPROTECTOR is not set CONFIG_HZ_100=y # CONFIG_HZ_250 is not set @@ -501,7 +496,6 @@ CONFIG_NF_CONNTRACK_PPTP=m CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CONNTRACK_SLP=m CONFIG_NF_CT_NETLINK=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -572,7 +566,6 @@ CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_IPV4OPTIONS=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_LOG=m @@ -821,6 +814,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_MINSTREL=y # CONFIG_MAC80211_RC_DEFAULT_PID is not set CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y @@ -834,7 +828,6 @@ CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y # CONFIG_NET_9P is not set -# CONFIG_NETVM is not set # # Device Drivers @@ -976,7 +969,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_BLK_DEV_XIP is not set # CONFIG_CDROM_PKTCDVD is not set CONFIG_ATA_OVER_ETH=m -# CONFIG_CIPHER_TWOFISH is not set # CONFIG_BLK_DEV_HD is not set CONFIG_MISC_DEVICES=y # CONFIG_IBM_ASM is not set @@ -1002,75 +994,7 @@ CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y CONFIG_HAVE_IDE=y -CONFIG_IDE=y - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_ATAPI=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -# CONFIG_IDE_GD_ATAPI is not set -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_DELKIN=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -# CONFIG_BLK_DEV_IDETAPE is not set -CONFIG_BLK_DEV_IDEACPI=y -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=m -CONFIG_BLK_DEV_PLATFORM=m -CONFIG_BLK_DEV_CMD640=m -CONFIG_BLK_DEV_CMD640_ENHANCED=y -CONFIG_BLK_DEV_IDEPNP=m -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_PCIBUS_ORDER=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m -CONFIG_BLK_DEV_OPTI621=m -CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_AEC62XX=m -CONFIG_BLK_DEV_ALI15X3=m -CONFIG_BLK_DEV_AMD74XX=m -CONFIG_BLK_DEV_ATIIXP=m -CONFIG_BLK_DEV_CMD64X=m -CONFIG_BLK_DEV_TRIFLEX=m -CONFIG_BLK_DEV_CS5520=m -CONFIG_BLK_DEV_CS5530=m -CONFIG_BLK_DEV_CS5535=m -CONFIG_BLK_DEV_CS5536=m -CONFIG_BLK_DEV_HPT366=m -CONFIG_BLK_DEV_JMICRON=m -CONFIG_BLK_DEV_SC1200=m -CONFIG_BLK_DEV_PIIX=m -CONFIG_BLK_DEV_IT8172=m -CONFIG_BLK_DEV_IT8213=m -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=m -CONFIG_BLK_DEV_PDC202XX_NEW=m -CONFIG_BLK_DEV_SVWKS=m -CONFIG_BLK_DEV_SIIMAGE=m -CONFIG_BLK_DEV_SIS5513=m -CONFIG_BLK_DEV_SLC90E66=m -CONFIG_BLK_DEV_TRM290=m -CONFIG_BLK_DEV_VIA82CXXX=m -CONFIG_BLK_DEV_TC86C001=m -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDE is not set # # SCSI device support @@ -1117,7 +1041,6 @@ CONFIG_SCSI_CXGB3_ISCSI=m CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BE2ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_HPSA=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m @@ -1297,14 +1220,12 @@ CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_QL=m CONFIG_DM_MULTIPATH_ST=m CONFIG_DM_DELAY=m -CONFIG_DM_RAID45=m CONFIG_DM_UEVENT=y CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_MAX_FC_SGE=256 CONFIG_FUSION_CTL=m # CONFIG_FUSION_LOGGING is not set @@ -1324,17 +1245,7 @@ CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m -CONFIG_IEEE1394=m -CONFIG_IEEE1394_OHCI1394=m -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_SBP2=m -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set -CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y -CONFIG_IEEE1394_ETH1394=m -CONFIG_IEEE1394_RAWIO=m -CONFIG_IEEE1394_VIDEO1394=m -# CONFIG_IEEE1394_DV1394 is not set -# CONFIG_IEEE1394_VERBOSEDEBUG is not set +# CONFIG_IEEE1394 is not set # CONFIG_I2O is not set # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y @@ -2445,11 +2356,6 @@ CONFIG_DVB_CAPTURE_DRIVERS=y # # CONFIG_DVB_DM1105 is not set -# -# Supported FireWire (IEEE 1394) Adapters -# -# CONFIG_DVB_FIREDTV is not set - # # Supported Earthsoft PT1 Adapters # @@ -2627,11 +2533,6 @@ CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y CONFIG_LOGO_LINUX_CLUT224=y - -# -# Bootsplash configuration -# -# CONFIG_BOOTSPLASH is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y CONFIG_SOUND_OSS_CORE_PRECLAIM=y @@ -3019,7 +2920,6 @@ CONFIG_USB_BERRY_CHARGE=m CONFIG_USB_LED=m CONFIG_USB_CYPRESS_CY7C63=m CONFIG_USB_CYTHERM=m -# CONFIG_USB_PHIDGET is not set # CONFIG_USB_IDMOUSE is not set CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_APPLEDISPLAY is not set @@ -3111,7 +3011,6 @@ CONFIG_LEDS_BD2802=m # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -3218,7 +3117,6 @@ CONFIG_XEN_INTERFACE_VERSION=0x00030207 CONFIG_XEN_PRIVILEGED_GUEST=y # CONFIG_XEN_UNPRIVILEGED_GUEST is not set CONFIG_XEN_PRIVCMD=y -CONFIG_XEN_DOMCTL=y CONFIG_XEN_XENBUS_DEV=y CONFIG_XEN_NETDEV_ACCEL_SFC_UTIL=y CONFIG_XEN_BACKEND=y @@ -3345,7 +3243,6 @@ CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y CONFIG_INTEL_MENLOW=m CONFIG_ACPI_WMI=m -CONFIG_MSI_WMI=m CONFIG_ACPI_ASUS=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_ACPI_TOSHIBA=m @@ -3373,7 +3270,6 @@ CONFIG_EXT3_FS=m # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y -# CONFIG_EXT3_FS_NFS4ACL is not set CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT4_FS=m CONFIG_EXT4_FS_XATTR=y @@ -3388,7 +3284,6 @@ CONFIG_REISER4_FS=m CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set CONFIG_REISERFS_PROC_INFO=y -# CONFIG_REISERFS_DEFAULTS_TO_BARRIERS_ENABLED is not set CONFIG_REISERFS_FS_XATTR=y CONFIG_REISERFS_FS_POSIX_ACL=y CONFIG_REISERFS_FS_SECURITY=y @@ -3398,10 +3293,8 @@ CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y -# CONFIG_FS_NFS4ACL is not set CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y -# CONFIG_XFS_DMAPI is not set CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set CONFIG_XFS_DEBUG=y @@ -3414,7 +3307,6 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y -# CONFIG_DMAPI is not set CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_PRINT_QUOTA_WARNING=y @@ -3507,7 +3399,6 @@ CONFIG_NFS_FS=m CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y -# CONFIG_NFS_SWAP is not set # CONFIG_NFS_V4_1 is not set CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y @@ -3521,7 +3412,6 @@ CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m -# CONFIG_SUNRPC_SWAP is not set CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m @@ -3613,11 +3503,13 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set -# CONFIG_STRIP_ASM_SYMS is not set -CONFIG_UNUSED_SYMBOLS=y +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set +# CONFIG_SLUB_DEBUG_ON is not set +CONFIG_SLUB_STATS=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_ARCH_WANT_FRAME_POINTERS=y diff --git a/config/mkinitcpio/load-modules.sh b/config/mkinitcpio/load-modules.sh deleted file mode 100644 index 33f8b6b1d5..0000000000 --- a/config/mkinitcpio/load-modules.sh +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh -# Implement blacklisting for udev-loaded modules -# Includes module checking -# - Aaron Griffin & Tobias Powalowski for Archlinux -[ $# -ne 1 ] && exit 1 - -if [ -f /proc/cmdline ]; then - for cmd in $(cat /proc/cmdline); do - case $cmd in - *=*) eval $cmd ;; - esac - done -fi - -# get the real names from modaliases -i="$(/bin/modprobe -i --show-depends $1 | minised "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" | minised 's|-|_|g')" -# add disablemodules= from commandline to blacklist -k="$(echo ${disablemodules} | minised 's|-|_|g' | minised 's|,| |g')" - -if [ "${k}" != "" ] ; then - for o in ${k}; do - echo "${o}.ko" >> /disablemodules - done - for n in ${i}; do - if /bin/ugrep "^$n.ko" /disablemodules 2>&1 >/dev/null; then - exit 1 - fi - done -fi -/bin/modprobe $1 - -# vim: set et ts=4: diff --git a/config/mkinitcpio/start_udev b/config/mkinitcpio/start_udev deleted file mode 100644 index 44e3272e88..0000000000 --- a/config/mkinitcpio/start_udev +++ /dev/null @@ -1,115 +0,0 @@ -#! /bin/sh -# -# start_udev -# script to initialize /dev by using udev. -# -# Modified for Archlinux by Tobias Powalowski -# -# Inspired by: -# -# Copyright (C) 2004 Greg Kroah-Hartman -# -# Released under the GPL v2 only. -# -# This needs to be run at the earliest possible point in the boot -# process. -# -# Based on the udev init.d script -# -# Thanks go out to the Gentoo developers for proving -# that this is possible to do. -# -# Yes, it's very verbose, feel free to turn off all of the echo calls, -# they were there to make me feel better that everything was working -# properly during development... - -prog=udev -sysfs_dir=/sys -bin=/sbin/udev -udevd=/sbin/udevd -udev_root="/dev" - -trigger_device_events () -{ - /sbin/udevtrigger -} - -wait_for_queue () -{ - # disabled because it hangs network boot - #loop=20 - #while ! [ "$loop" -gt 0 -a -d /dev/.udev/queue ]; do - # sleep 0.1; - # loop=$(($loop - 1)) - #done - /sbin/udevsettle -} - -make_extra_nodes () -{ - # there are a few things that sysfs does not export for us. - # these things go here (and remember to remove them in - # remove_extra_nodes() - # - # Thanks to Gentoo for the initial list of these. - ln -sf /proc/self/fd $udev_root/fd - ln -sf /proc/self/fd/0 $udev_root/stdin - ln -sf /proc/self/fd/1 $udev_root/stdout - ln -sf /proc/self/fd/2 $udev_root/stderr - ln -sf /proc/kcore $udev_root/core -} - -udev_init () -{ -# don't use udev if sysfs is not mounted. -if [ ! -d $sysfs_dir/block ]; then - exit 1 -fi - -#echo "mounting... ramfs at $udev_root" -mount -t ramfs none $udev_root - -# propogate /udev from /sys -#echo "Creating initial udev device nodes:" - -#echo "making extra nodes" -make_extra_nodes - -# check if udevd is already running -#echo "start udev daemon" -/sbin/udevd --daemon - -case "$(uname -r)" in - 2.6.[0-9]|2.6.[0-9][!0-9]*) ;; - *) if [ -f "/sys/class/tty/console/uevent" ]; then - #echo "Kernel >= 2.6.15 and supports uevents" - # trigger the sorted events - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - # catch events that are real fast - mkdir -p /dev/.udev/queue - else - # for older kernels without uevents will be removed when udevstart dies in udev - echo "Kernel does not support uevents, you need a kernel >= 2.6.15!" - exit 1 - fi - ;; -esac -} - -udev_uevents () -{ -# configure all devices -trigger_device_events -# until we know how to do better, just wait for _all_ events to finish -wait_for_queue -} - -if [ $# -eq 0 ]; then -udev_init -udev_uevents -fi - -[ "$1" = "init" ] && udev_init -[ "$1" = "uevents" ] && udev_uevents - -exit 0 diff --git a/config/mkinitcpio/udev.rules b/config/mkinitcpio/udev.rules deleted file mode 100644 index 939a94631a..0000000000 --- a/config/mkinitcpio/udev.rules +++ /dev/null @@ -1,71 +0,0 @@ -# Udev rules for Archlinux by Tobias Powalowski -# -# This ruleset should provide a DevFS-compatible device tree. -# -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %k the kernel name for the device. -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute. -# %% the '%' char itself. -# -# 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. -# global stuff -# - -##################################### -# Early rules - begin -##################################### -# wait for sysfs -ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" -ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" - -##################################### -# Early rules -end -##################################### - -##################################### -###### Hotplug rules - begin -##################################### -# check if the device has already been claimed by a driver -ENV{PHYSDEVDRIVER}=="?*", GOTO="hotplug_driver_loaded" - -# Modaliases to load -ACTION=="add", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}" -# SCSI addon modules -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", RUN+="/lib/udev/load-modules.sh sd_mod" -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", RUN+="/lib/udev/load-modules.sh sd_mod" -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[45]", RUN+="/lib/udev/load-modules.sh sr_mod" -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream", SYSFS{model}!="ADR*", RUN+="/lib/udev/load-modules.sh osst" -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream", SYSFS{model}=="ADR*", RUN+="/lib/udev/load-modules.sh st" -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}!="Onstream", RUN+="/lib/udev/load-modules.sh st" -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", RUN+="/lib/udev/load-modules.sh sg" - -LABEL="hotplug_driver_loaded" - -# FIRMWARE -ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="?*", RUN+="/lib/udev/firmware.sh" -##################################### -##### Hotplug rules - end -##################################### - -##################################### -###### CD/DVD symlinks - begin -##################################### -ACTION=="add", BUS=="ide", KERNEL=="hd[a-z]", IMPORT="/lib/udev/cdrom_id --export $tempnode" -ACTION=="add", BUS=="scsi", KERNEL=="sr[0-9]*", IMPORT="/lib/udev/cdrom_id --export $tempnode" -ACTION=="add", BUS=="scsi", KERNEL=="scd[a-z]", IMPORT="/lib/udev/cdrom_id --export $tempnode" -ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b" -ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b" -ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b" -ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvd-%b" -##################################### -###### CD/DVD symlinks - end -##################################### diff --git a/config/mkinitcpio/udev_hook b/config/mkinitcpio/udev_hook deleted file mode 100644 index fc4c8144a5..0000000000 --- a/config/mkinitcpio/udev_hook +++ /dev/null @@ -1,7 +0,0 @@ -# vim: set ft=sh: -run_hook () -{ - msg -n ":: Loading udev..." - /etc/start_udev - msg "done." -} diff --git a/config/mkinitcpio/udev_install b/config/mkinitcpio/udev_install deleted file mode 100644 index 473956ab8c..0000000000 --- a/config/mkinitcpio/udev_install +++ /dev/null @@ -1,26 +0,0 @@ -# vim:set ft=sh: - -install () -{ - MODULES="" - BINARIES="" - FILES=" /etc/udev/udev.conf" - SCRIPT="udev" - add_file /lib/initcpio/udev/udevd /sbin/udevd - add_file /lib/initcpio/udev/udevtrigger /sbin/udevtrigger - add_file /lib/initcpio/udev/udevsettle /sbin/udevsettle - add_file /lib/initcpio/udev/udev.rules /etc/udev/rules.d/udev.rules - add_file /lib/initcpio/udev/start_udev /etc/start_udev - add_file /lib/initcpio/udev/firmware.sh /lib/udev/firmware.sh - add_file /lib/initcpio/udev/cdrom_id /lib/udev/cdrom_id - add_file /lib/initcpio/udev/load-modules.sh /lib/udev/load-modules.sh -} - -help () -{ -cat <. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -# -#Stop services -/usr/local/bin/openvpnctrl -k -# -#Extract files -extract_files -# -#Remove old python files... -rm -rf /usr/lib/python2.4 - -# -#Start services -/usr/local/bin/openvpnctrl -s - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Change var lock size to 8MB -grep -v "/var/lock" /etc/fstab > /tmp/fstab.tmp -mv /tmp/fstab.tmp /etc/fstab -echo non /var/lock tmpfs defaults,size=8M 0 0 >> /etc/fstab - - -#Rebuild module dep's -depmod 2.6.32.15-ipfire -depmod 2.6.32.15-ipfire-xen -# -#Finish -#Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/test/exclude b/config/rootfiles/core/test/exclude new file mode 100644 index 0000000000..759e081672 --- /dev/null +++ b/config/rootfiles/core/test/exclude @@ -0,0 +1 @@ +etc/udev/rules.d/30-persistent-network.rules diff --git a/config/rootfiles/core/test/filelists/dracut b/config/rootfiles/core/test/filelists/dracut new file mode 120000 index 0000000000..160869946d --- /dev/null +++ b/config/rootfiles/core/test/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files new file mode 100644 index 0000000000..509483d066 --- /dev/null +++ b/config/rootfiles/core/test/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/rc.d/init.d/checkfstab +usr/local/bin/rebuild-initrd diff --git a/config/rootfiles/core/38/filelists/grub b/config/rootfiles/core/test/filelists/grub similarity index 100% rename from config/rootfiles/core/38/filelists/grub rename to config/rootfiles/core/test/filelists/grub diff --git a/config/rootfiles/core/38/filelists/linux b/config/rootfiles/core/test/filelists/linux similarity index 100% rename from config/rootfiles/core/38/filelists/linux rename to config/rootfiles/core/test/filelists/linux diff --git a/config/rootfiles/core/38/filelists/linux-firmware b/config/rootfiles/core/test/filelists/linux-firmware similarity index 100% rename from config/rootfiles/core/38/filelists/linux-firmware rename to config/rootfiles/core/test/filelists/linux-firmware diff --git a/config/rootfiles/core/test/filelists/tcl b/config/rootfiles/core/test/filelists/tcl new file mode 120000 index 0000000000..7f620c687e --- /dev/null +++ b/config/rootfiles/core/test/filelists/tcl @@ -0,0 +1 @@ +../../../common/tcl \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/udev b/config/rootfiles/core/test/filelists/udev new file mode 120000 index 0000000000..e967a1c925 --- /dev/null +++ b/config/rootfiles/core/test/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/usb_modeswitch b/config/rootfiles/core/test/filelists/usb_modeswitch similarity index 100% rename from config/rootfiles/core/38/filelists/usb_modeswitch rename to config/rootfiles/core/test/filelists/usb_modeswitch diff --git a/config/rootfiles/core/test/filelists/usb_modeswitch_data b/config/rootfiles/core/test/filelists/usb_modeswitch_data new file mode 120000 index 0000000000..4cbce46cf7 --- /dev/null +++ b/config/rootfiles/core/test/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/38/meta b/config/rootfiles/core/test/meta similarity index 100% rename from config/rootfiles/core/38/meta rename to config/rootfiles/core/test/meta diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh new file mode 100644 index 0000000000..1a18fcef9e --- /dev/null +++ b/config/rootfiles/core/test/update.sh @@ -0,0 +1,115 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2010 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 +# +KVER="2.6.32.19" +ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` +MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi +# +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 +fi +echo First we made a backup of all files that was inside of the +echo update archive. This may take a while ... +# Add some files that are not in the package to backup +echo lib/modules >> /opt/pakfire/tmp/ROOTFILES +echo boot >> /opt/pakfire/tmp/ROOTFILES +echo etc/mkinitcpio.conf >> /opt/pakfire/tmp/ROOTFILES +echo etc/mkinitcpio.conf.org >> /opt/pakfire/tmp/ROOTFILES +echo etc/mkinitcpio.d >> /opt/pakfire/tmp/ROOTFILES +echo lib/initcpio >> /opt/pakfire/tmp/ROOTFILES +echo sbin/mkinitcpio >> /opt/pakfire/tmp/ROOTFILES + +# Backup the files +tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1 + +echo +echo Update Kernel to $KVER ... +# Remove old kernel, configs, initrd, modules ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/vmlinuz-* +rm -rf /lib/modules/*-ipfire +# Remove mkinitcpio +rm -rf /etc/mkinitcpio.* +rm -rf /lib/initcpio +rm -rf /sbin/mkinitcpio +# +# Backup grub.conf +# +cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org +# +# Unpack the updated files +# +echo +echo Unpack the updated files ... +# +tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ + --no-overwrite-dir +# +# Modify grub.conf +# +echo +echo Update grub configuration ... +sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf +sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf +sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf + +if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then + echo "grub use default console ..." +else + echo "grub use serial console ..." + sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf + sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf + sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf + sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf +fi +# +# ReInstall grub +# +grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck +# +# Rebuild Language +# +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors +/usr/bin/logger -p syslog.emerg -t kernel "Upgrade finished. If you use a customized grub.cfg" +/usr/bin/logger -p syslog.emerg -t kernel "Check it before reboot !!!" +/usr/bin/logger -p syslog.emerg -t kernel " *** Please reboot... *** " diff --git a/config/rootfiles/installer/coreutils b/config/rootfiles/installer/coreutils new file mode 120000 index 0000000000..b41d95ad57 --- /dev/null +++ b/config/rootfiles/installer/coreutils @@ -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 index 0000000000..2a6ee42cc4 --- /dev/null +++ b/config/rootfiles/installer/e2fsprogs @@ -0,0 +1 @@ +../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/installer/eject b/config/rootfiles/installer/eject new file mode 120000 index 0000000000..54928be24c --- /dev/null +++ b/config/rootfiles/installer/eject @@ -0,0 +1 @@ +../common/eject \ No newline at end of file diff --git a/config/rootfiles/installer/gawk b/config/rootfiles/installer/gawk new file mode 120000 index 0000000000..a7660cfcb8 --- /dev/null +++ b/config/rootfiles/installer/gawk @@ -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 index 0000000000..73e445e7a1 --- /dev/null +++ b/config/rootfiles/installer/glibc @@ -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 index 0000000000..f7bf2d96a8 --- /dev/null +++ b/config/rootfiles/installer/grep @@ -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 index 0000000000..7ed7e21d67 --- /dev/null +++ b/config/rootfiles/installer/hwdata @@ -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 index 0000000000..3efe86af2a --- /dev/null +++ b/config/rootfiles/installer/kbd @@ -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 index 0000000000..da66b915a0 --- /dev/null +++ b/config/rootfiles/installer/kudzu @@ -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 index 0000000000..ac5e8dd9df --- /dev/null +++ b/config/rootfiles/installer/misc-progs @@ -0,0 +1 @@ +usr/local/bin/iowrap diff --git a/config/rootfiles/installer/mtd b/config/rootfiles/installer/mtd new file mode 120000 index 0000000000..75bc3db4a4 --- /dev/null +++ b/config/rootfiles/installer/mtd @@ -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 index 0000000000..7aac8a22b8 --- /dev/null +++ b/config/rootfiles/installer/ncurses @@ -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 index 0000000000..b63c4809e8 --- /dev/null +++ b/config/rootfiles/installer/newt @@ -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 index 0000000000..903f12430b --- /dev/null +++ b/config/rootfiles/installer/pciutils @@ -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 index 0000000000..47b2fe8f40 --- /dev/null +++ b/config/rootfiles/installer/pcmciautils @@ -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 index 0000000000..d15b2c6148 --- /dev/null +++ b/config/rootfiles/installer/popt @@ -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 index 0000000000..f1f6d64987 --- /dev/null +++ b/config/rootfiles/installer/reboot @@ -0,0 +1,2 @@ +sbin/reboot +sbin/halt diff --git a/config/rootfiles/installer/reiserfsprogs b/config/rootfiles/installer/reiserfsprogs new file mode 120000 index 0000000000..f596f68aca --- /dev/null +++ b/config/rootfiles/installer/reiserfsprogs @@ -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 index 0000000000..4b0d3a3cdc --- /dev/null +++ b/config/rootfiles/installer/sed @@ -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 index 0000000000..405fd4072e --- /dev/null +++ b/config/rootfiles/installer/slang @@ -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 index 0000000000..9c56a9af96 --- /dev/null +++ b/config/rootfiles/installer/sysfsutils @@ -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 index 0000000000..f994ef6590 --- /dev/null +++ b/config/rootfiles/installer/tar @@ -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 index 0000000000..c8ab83eac8 --- /dev/null +++ b/config/rootfiles/installer/util-linux @@ -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 index 0000000000..3ae92f3f08 --- /dev/null +++ b/config/rootfiles/installer/vim @@ -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 index 0000000000..61772c7a2a --- /dev/null +++ b/config/rootfiles/installer/xz @@ -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 index 0000000000..fcdedec9b1 --- /dev/null +++ b/config/rootfiles/installer/zlib @@ -0,0 +1 @@ +../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/38/exclude b/config/rootfiles/oldcore/38/exclude similarity index 100% rename from config/rootfiles/core/38/exclude rename to config/rootfiles/oldcore/38/exclude diff --git a/config/rootfiles/core/38/filelists/Net_SSLeay b/config/rootfiles/oldcore/38/filelists/Net_SSLeay similarity index 100% rename from config/rootfiles/core/38/filelists/Net_SSLeay rename to config/rootfiles/oldcore/38/filelists/Net_SSLeay diff --git a/config/rootfiles/core/38/filelists/collectd b/config/rootfiles/oldcore/38/filelists/collectd similarity index 100% rename from config/rootfiles/core/38/filelists/collectd rename to config/rootfiles/oldcore/38/filelists/collectd diff --git a/config/rootfiles/core/38/filelists/compat-wireless b/config/rootfiles/oldcore/38/filelists/compat-wireless similarity index 100% rename from config/rootfiles/core/38/filelists/compat-wireless rename to config/rootfiles/oldcore/38/filelists/compat-wireless diff --git a/config/rootfiles/core/38/filelists/dosfstools b/config/rootfiles/oldcore/38/filelists/dosfstools similarity index 100% rename from config/rootfiles/core/38/filelists/dosfstools rename to config/rootfiles/oldcore/38/filelists/dosfstools diff --git a/config/rootfiles/core/38/filelists/e2fsprogs b/config/rootfiles/oldcore/38/filelists/e2fsprogs similarity index 100% rename from config/rootfiles/core/38/filelists/e2fsprogs rename to config/rootfiles/oldcore/38/filelists/e2fsprogs diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/oldcore/38/filelists/files similarity index 100% rename from config/rootfiles/core/38/filelists/files rename to config/rootfiles/oldcore/38/filelists/files diff --git a/config/rootfiles/core/38/filelists/fuse b/config/rootfiles/oldcore/38/filelists/fuse similarity index 100% rename from config/rootfiles/core/38/filelists/fuse rename to config/rootfiles/oldcore/38/filelists/fuse diff --git a/config/rootfiles/oldcore/38/filelists/grub b/config/rootfiles/oldcore/38/filelists/grub new file mode 120000 index 0000000000..050745c10d --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/grub @@ -0,0 +1 @@ +../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/iptables b/config/rootfiles/oldcore/38/filelists/iptables similarity index 100% rename from config/rootfiles/core/38/filelists/iptables rename to config/rootfiles/oldcore/38/filelists/iptables diff --git a/config/rootfiles/core/38/filelists/liboping b/config/rootfiles/oldcore/38/filelists/liboping similarity index 100% rename from config/rootfiles/core/38/filelists/liboping rename to config/rootfiles/oldcore/38/filelists/liboping diff --git a/config/rootfiles/oldcore/38/filelists/linux b/config/rootfiles/oldcore/38/filelists/linux new file mode 120000 index 0000000000..c469fe1886 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/linux @@ -0,0 +1 @@ +../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/linux-firmware b/config/rootfiles/oldcore/38/filelists/linux-firmware new file mode 120000 index 0000000000..4bf91bca9f --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/mISDN b/config/rootfiles/oldcore/38/filelists/mISDN similarity index 100% rename from config/rootfiles/core/38/filelists/mISDN rename to config/rootfiles/oldcore/38/filelists/mISDN diff --git a/config/rootfiles/core/38/filelists/mISDNuser b/config/rootfiles/oldcore/38/filelists/mISDNuser similarity index 100% rename from config/rootfiles/core/38/filelists/mISDNuser rename to config/rootfiles/oldcore/38/filelists/mISDNuser diff --git a/config/rootfiles/core/38/filelists/menu b/config/rootfiles/oldcore/38/filelists/menu similarity index 100% rename from config/rootfiles/core/38/filelists/menu rename to config/rootfiles/oldcore/38/filelists/menu diff --git a/config/rootfiles/core/38/filelists/mkinitcpio b/config/rootfiles/oldcore/38/filelists/mkinitcpio similarity index 100% rename from config/rootfiles/core/38/filelists/mkinitcpio rename to config/rootfiles/oldcore/38/filelists/mkinitcpio diff --git a/config/rootfiles/core/38/filelists/openssh b/config/rootfiles/oldcore/38/filelists/openssh similarity index 100% rename from config/rootfiles/core/38/filelists/openssh rename to config/rootfiles/oldcore/38/filelists/openssh diff --git a/config/rootfiles/core/38/filelists/openssl b/config/rootfiles/oldcore/38/filelists/openssl similarity index 100% rename from config/rootfiles/core/38/filelists/openssl rename to config/rootfiles/oldcore/38/filelists/openssl diff --git a/config/rootfiles/core/38/filelists/pcre b/config/rootfiles/oldcore/38/filelists/pcre similarity index 100% rename from config/rootfiles/core/38/filelists/pcre rename to config/rootfiles/oldcore/38/filelists/pcre diff --git a/config/rootfiles/core/38/filelists/reiser4progs b/config/rootfiles/oldcore/38/filelists/reiser4progs similarity index 100% rename from config/rootfiles/core/38/filelists/reiser4progs rename to config/rootfiles/oldcore/38/filelists/reiser4progs diff --git a/config/rootfiles/core/38/filelists/reiserfsprogs b/config/rootfiles/oldcore/38/filelists/reiserfsprogs similarity index 100% rename from config/rootfiles/core/38/filelists/reiserfsprogs rename to config/rootfiles/oldcore/38/filelists/reiserfsprogs diff --git a/config/rootfiles/core/38/filelists/rrdtool b/config/rootfiles/oldcore/38/filelists/rrdtool similarity index 100% rename from config/rootfiles/core/38/filelists/rrdtool rename to config/rootfiles/oldcore/38/filelists/rrdtool diff --git a/config/rootfiles/core/38/filelists/smartmontools b/config/rootfiles/oldcore/38/filelists/smartmontools similarity index 100% rename from config/rootfiles/core/38/filelists/smartmontools rename to config/rootfiles/oldcore/38/filelists/smartmontools diff --git a/config/rootfiles/core/38/filelists/snort b/config/rootfiles/oldcore/38/filelists/snort similarity index 100% rename from config/rootfiles/core/38/filelists/snort rename to config/rootfiles/oldcore/38/filelists/snort diff --git a/config/rootfiles/core/38/filelists/strongswan b/config/rootfiles/oldcore/38/filelists/strongswan similarity index 100% rename from config/rootfiles/core/38/filelists/strongswan rename to config/rootfiles/oldcore/38/filelists/strongswan diff --git a/config/rootfiles/oldcore/38/filelists/usb_modeswitch b/config/rootfiles/oldcore/38/filelists/usb_modeswitch new file mode 120000 index 0000000000..acbab6f332 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/xz b/config/rootfiles/oldcore/38/filelists/xz similarity index 100% rename from config/rootfiles/core/38/filelists/xz rename to config/rootfiles/oldcore/38/filelists/xz diff --git a/config/rootfiles/core/38/filelists/zlib b/config/rootfiles/oldcore/38/filelists/zlib similarity index 100% rename from config/rootfiles/core/38/filelists/zlib rename to config/rootfiles/oldcore/38/filelists/zlib diff --git a/config/rootfiles/core/39/meta b/config/rootfiles/oldcore/38/meta similarity index 100% rename from config/rootfiles/core/39/meta rename to config/rootfiles/oldcore/38/meta diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/oldcore/38/update.sh similarity index 100% rename from config/rootfiles/core/38/update.sh rename to config/rootfiles/oldcore/38/update.sh diff --git a/config/rootfiles/core/39/exclude b/config/rootfiles/oldcore/39/exclude similarity index 100% rename from config/rootfiles/core/39/exclude rename to config/rootfiles/oldcore/39/exclude diff --git a/config/rootfiles/core/39/filelists/files b/config/rootfiles/oldcore/39/filelists/files similarity index 100% rename from config/rootfiles/core/39/filelists/files rename to config/rootfiles/oldcore/39/filelists/files diff --git a/config/rootfiles/core/39/filelists/libevent b/config/rootfiles/oldcore/39/filelists/libevent similarity index 100% rename from config/rootfiles/core/39/filelists/libevent rename to config/rootfiles/oldcore/39/filelists/libevent diff --git a/config/rootfiles/core/39/filelists/libpng b/config/rootfiles/oldcore/39/filelists/libpng similarity index 100% rename from config/rootfiles/core/39/filelists/libpng rename to config/rootfiles/oldcore/39/filelists/libpng diff --git a/config/rootfiles/core/39/filelists/ppp b/config/rootfiles/oldcore/39/filelists/ppp similarity index 100% rename from config/rootfiles/core/39/filelists/ppp rename to config/rootfiles/oldcore/39/filelists/ppp diff --git a/config/rootfiles/core/39/filelists/strongswan b/config/rootfiles/oldcore/39/filelists/strongswan similarity index 100% rename from config/rootfiles/core/39/filelists/strongswan rename to config/rootfiles/oldcore/39/filelists/strongswan diff --git a/config/rootfiles/core/39/filelists/terminfo-screen b/config/rootfiles/oldcore/39/filelists/terminfo-screen similarity index 100% rename from config/rootfiles/core/39/filelists/terminfo-screen rename to config/rootfiles/oldcore/39/filelists/terminfo-screen diff --git a/config/rootfiles/core/40/meta b/config/rootfiles/oldcore/39/meta similarity index 100% rename from config/rootfiles/core/40/meta rename to config/rootfiles/oldcore/39/meta diff --git a/config/rootfiles/core/39/update.sh b/config/rootfiles/oldcore/39/update.sh similarity index 100% rename from config/rootfiles/core/39/update.sh rename to config/rootfiles/oldcore/39/update.sh diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 8f11d1219e..ef6b6355a2 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -1,4 +1,4 @@ -== List of softwares used to build IPFire Version: 2.7 == +== List of softwares used to build IPFire Version: 2.8test == * Archive-Tar-1.29 * Archive-Zip-1.16 * BerkeleyDB-0.27 @@ -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.19-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 @@ -68,20 +67,20 @@ * clamav-0.96.2 * cmake-2.4.8 * collectd-4.9.1 -* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire -* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire-xen +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire-xen * 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.19-ipfire +* cryptodev-20091126-kmod-2.6.32.19-ipfire-xen * 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.19-ipfire +* dahdi-2.2.1-kmod-2.6.32.19-ipfire-xen * db-4.4.20 * dbus-1.0.3 * ddrescue-1.12 @@ -90,10 +89,11 @@ * diffutils-2.8.1 * dnsmasq-2.45 * dosfstools-3.0.9 -* 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 +* dracut-006 +* e1000-8.0.19-kmod-2.6.32.19-ipfire +* e1000-8.0.19-kmod-2.6.32.19-ipfire-xen +* e1000e-1.1.19-kmod-2.6.32.19-ipfire +* e1000e-1.1.19-kmod-2.6.32.19-ipfire-xen * e2fsprogs-1.41.11 * ebtables-v2.0.8-2 * ed-0.2 @@ -162,11 +162,9 @@ * joe-3.7 * jpegsrc.v6b * kbd-1.12 -* klibc-1.5.14 -* 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.19-ipfire +* kqemu-1.4.0pre1-kmod-2.6.32.19-ipfire-xen * 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 @@ -199,8 +197,8 @@ * 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.19-ipfire +* linux-2.6.32.19-ipfire-xen * linux-atm-2.4.1 * linux-firmware-20100318 * linux-libc-headers-2.6.12.0 @@ -211,11 +209,11 @@ * 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.19-ipfire +* mISDN-20100525-kmod-2.6.32.19-ipfire-xen * 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.19-ipfire +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.19-ipfire-xen * make-3.81 * man-db-2.4.3 * man-pages-2.34 @@ -228,7 +226,6 @@ * miau-0.6.5 * minicom-2.4 * misc-progs -* mkinitcpio-0.5.9 * mktemp-1.5 * mldonkey-3.0.0 * module-init-tools-3.5 @@ -285,12 +282,12 @@ * 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.19-ipfire +* r8101-1.016.00-kmod-2.6.32.19-ipfire-xen +* r8168-8.018.00-kmod-2.6.32.19-ipfire +* r8168-8.018.00-kmod-2.6.32.19-ipfire-xen +* r8169-6.013.00-kmod-2.6.32.19-ipfire +* r8169-6.013.00-kmod-2.6.32.19-ipfire-xen * readline-5.1 * reiser4progs-1.0.6 * reiserfsprogs-3.6.21 @@ -324,11 +321,12 @@ * sudo-1.6.8p12 * sysfsutils-1.3.0 * sysklogd-1.5 -* syslinux-3.62 +* syslinux-3.86 * sysstat-6.0.2 * sysvinit-2.86 * taglib-1.5 * tar-1.22 +* tcl8.4.13 * tcp_wrappers_7.6 * tcpdump-4.0.0 * teamspeak-2.0.24.1 @@ -338,15 +336,15 @@ * traceroute-2.0.12 * tripwire-2.4.1.2 * tunctl -* udev-096 -* udev-096-klibc +* udev-125 * unzip552 * urlgrabber-3.1.0 -* usb-modeswitch-1.1.2 +* usb-modeswitch-1.1.3 +* usb-modeswitch-data-20100707 * 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.19-ipfire +* v4l-dvb-b576509ea6d2-kmod-2.6.32.19-ipfire-xen * vdr-1.6.0 * vdradmin-am-3.6.7 * vim-7.0 diff --git a/lfs/cdrom b/lfs/cdrom index d5df330c41..0c4668d898 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -87,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp $(DIR_SRC)/config/syslinux/options.msg /install/cdrom/boot/isolinux/options.msg; \ cp $(DIR_SRC)/config/syslinux/splash.lss /install/cdrom/boot/isolinux/splash.lss; \ cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest; \ - cp /usr/lib/syslinux/isolinux.bin /install/cdrom/boot/isolinux/isolinux.bin; \ + cp /usr/share/syslinux/isolinux.bin /install/cdrom/boot/isolinux/isolinux.bin; \ cd /install/cdrom && find -type f ! -name md5sum.txt | grep -v "./boot" | \ xargs md5sum > md5sum.txt; \ cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \ diff --git a/lfs/mkinitcpio b/lfs/dracut similarity index 74% rename from lfs/mkinitcpio rename to lfs/dracut index da0de4dfcb..726eedb409 100644 --- a/lfs/mkinitcpio +++ b/lfs/dracut @@ -24,12 +24,12 @@ include Config -VER = 0.5.9 +VER = 006 -THISAPP = mkinitcpio-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = dracut-$(VER) +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/mkinitcpio +DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a80ca2af36962eaf85a7861ddfd4eea7 +$(DL_FILE)_MD5 = 016052b57001789ec2acf89d382a82f5 install : $(TARGET) @@ -69,13 +69,25 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./install.sh "" - cp $(DIR_SRC)/config/mkinitcpio/virtio /lib/initcpio/install/ - sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio - sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata virtio"|g' /etc/mkinitcpio.conf - sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3 ext2 ehci_hcd sd_mod"|g' /etc/mkinitcpio.conf - sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide - sed -i 's| gzip -9 | lzma |g' /sbin/mkinitcpio + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_lzma.patch + + cd $(DIR_APP) && cp -vf $(DIR_SRC)/src/dracut/switch_root.c . + + cd $(DIR_APP) && make $(MAKETUNING) WITH_SWITCH_ROOT=1 + cd $(DIR_APP) && make install WITH_SWITCH_ROOT=1 \ + sbindir=/sbin sysconfdir=/etc + + cp -vf $(DIR_SRC)/src/dracut/dracut.conf /etc/dracut.conf.d/ + + rm -rf /usr/share/dracut/modules.d/*{dash,fips,redhat-i18n,rpmversion,network,ifcfg,plymouth,btrfs,crypt,dm,dmraid,dmsquash-live,lvm,mdraid,multipath,dasd,dasd_mod,fcoe,iscsi,nbd,nfs,resume,uswsusp,zfcp,znet,selinux} + + sed -e "s/--resolve-names=never//g" -i \ + /usr/share/dracut/modules.d/99base/init + + # Build initramdisk + /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER).img $(KVER)-ipfire + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/flash-images b/lfs/flash-images index 7d9ac3ee06..99ed45f284 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -94,30 +94,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chroot $(MNThdd) /usr/bin/perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" sed -i -e "s|MOUNT|ro|g" $(MNThdd)/boot/grub/grub.conf sed -i -e "s|KVER|$(KVER)|g" $(MNThdd)/boot/grub/grub.conf - sed -i -e "s|ROOT|/dev/sda3|g" $(MNThdd)/boot/grub/grub.conf + sed -i -e "s|ROOT|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" $(MNThdd)/boot/grub/grub.conf ln -s grub.conf $(MNThdd)/boot/grub/menu.lst + sed -i -e "s|DEVICE1|UUID=$$(blkid -sUUID $(IMGboot) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab 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|DEVICE3|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab + sed -i -e "s|DEVICE4|UUID=$$(blkid -sUUID $(IMGvar) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab sed -i -e "s|FSTYPE|ext2|g" $(MNThdd)/etc/fstab - cp -f $(MNThdd)/etc/mkinitcpio.conf $(MNThdd)/etc/mkinitcpio.conf.org - sed -i -e "s| autodetect | |g" $(MNThdd)/etc/mkinitcpio.conf - chroot $(MNThdd) /sbin/mkinitcpio -g /boot/ipfirerd-$(KVER)-emergency.img -k $(KVER)-ipfire - cp -f $(MNThdd)/etc/mkinitcpio.conf.org $(MNThdd)/etc/mkinitcpio.conf - ln -s ipfirerd-$(KVER)-emergency.img $(MNThdd)/boot/ipfirerd-$(KVER).img # Copy grub files manually cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/ - #chroot $(MNThdd) /usr/sbin/grub-set-default 0 - - # Create a script for rebuild-initrd and setup - echo "#!/bin/bash" > $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup - echo "/bin/rm -f /boot/ipfirerd-$(KVER).img" >> $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup - echo "/usr/local/bin/rebuild-initrd" >> $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup - echo "/usr/local/sbin/setup /dev/null INSTALL" >> $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup - echo "rm -f /etc/rc.d/rcsysinit.d/S75firstsetup \\" >> $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup - echo "&& /sbin/reboot" >> $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup - - chmod +x $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup # Unmount umount $(MNThdd)/proc diff --git a/lfs/initrd b/lfs/initrd index cf4f280850..cf2dc3f475 100644 --- a/lfs/initrd +++ b/lfs/initrd @@ -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 | grep -v "^#" > /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 diff --git a/lfs/initscripts b/lfs/initscripts index a9fadf4de8..1dbf65ded7 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -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 diff --git a/lfs/installer b/lfs/installer index 28645cb7e8..dad9200100 100644 --- a/lfs/installer +++ b/lfs/installer @@ -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/lfs/klibc b/lfs/klibc deleted file mode 100644 index 1ab1215f7f..0000000000 --- a/lfs/klibc +++ /dev/null @@ -1,89 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.5.14 - -THISAPP = klibc-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) \ - klibc-extras-2.2.tar.gz \ - klibc-1.5.14-linux2.6.27-includes.tar.bz2 - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -klibc-extras-2.2.tar.gz = $(DL_FROM)/klibc-extras-2.2.tar.gz -klibc-1.5.14-linux2.6.27-includes.tar.bz2 = $(DL_FROM)/klibc-1.5.14-linux2.6.27-includes.tar.bz2 - -$(DL_FILE)_MD5 = 030d978a7f16800e8ccae12d6fb5e7ba -klibc-extras-2.2.tar.gz_MD5 = 7e5042978531048c369f59ca1a13055b -klibc-1.5.14-linux2.6.27-includes.tar.bz2_MD5 = 1f875129d35193e35d27ed2b61a80bb6 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/klibc* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) && \ - tar zxf $(DIR_DL)/klibc-extras-2.2.tar.gz - cd $(DIR_SRC) && tar jxf $(DIR_DL)/klibc-1.5.14-linux2.6.27-includes.tar.bz2 - - cd $(DIR_SRC)/klibc-extras && sed -i "s|^INSTALL = .*|INSTALL = /usr/bin/install -c -m 755|g" Makefile - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - cd $(DIR_SRC)/klibc-extras && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_SRC)/klibc-extras && make install - ln -sf sh.shared /usr/lib/klibc/bin/sh - @rm -rf $(DIR_APP) $(DIR_SRC)/klibc* - @$(POSTBUILD) diff --git a/lfs/linux b/lfs/linux index 5d27158f06..3b96464da2 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .15 -VER = 2.6.32.15 +PATCHLEVEL = .19 +VER = 2.6.32.19 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -35,7 +35,7 @@ CFLAGS = CXXFLAGS = PROG = linux-xen -PAK_VER = 10 +PAK_VER = 11 DEPS = "" # Normal build or XEN build. @@ -57,21 +57,21 @@ objects =$(DL_FILE) \ patch-2.6.16-nath323-1.3.bz2 \ reiser4-for-2.6.32.patch.bz2 \ squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 \ - xen-patches-2.6.32-2.tar.bz2 + xen-patches-2.6.32-2c.tar.bz2 $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 -xen-patches-2.6.32-2.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2.tar.bz2 +xen-patches-2.6.32-2c.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2c.tar.bz2 -$(DL_FILE)_MD5 = 1cbbf16e93bbe03368172872690600c0 +$(DL_FILE)_MD5 = 7f32112095a164e1330c07be72966ccb netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4 -xen-patches-2.6.32-2.tar.bz2_MD5 = d1d78d2e9b9b62dd869a490f4415de04 +xen-patches-2.6.32-2c.tar.bz2_MD5 = 62a75ddcba43894b20f754a94b299ce6 install : $(TARGET) @@ -109,7 +109,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ifeq "$(XEN)" "1" # Apply gentoo Xen patches mkdir -p $(DIR_SRC)/xen-patches - cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2.tar.bz2 + cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2c.tar.bz2 for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \ echo "*********** [Patch: $$x]"; \ @@ -144,9 +144,6 @@ endif # Add some more LED triggers cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch - # Huawei (Vodafone) K3765 & K4505 Usbids - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch - # Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch @@ -177,12 +174,6 @@ ifeq "$(XEN)" "" cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/ endif - # Rename ide-cd module to match with old kernel - mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd_mod.ko \ - /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd.ko - mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-gd_mod.ko \ - /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-disk.ko - # Remove mISDN modules rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN diff --git a/lfs/nut b/lfs/nut index b5a5eda4a4..c0b7c57e8a 100644 --- a/lfs/nut +++ b/lfs/nut @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nut -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-wrap=no --with-udev-dir=/etc/udev cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules +# sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules -mkdir -p /var/state/ups install -v -m 644 $(DIR_SRC)/config/backup/includes/nut \ /var/ipfire/backup/addons/includes/nut diff --git a/lfs/syslinux b/lfs/syslinux index b521988811..cae55947ac 100644 --- a/lfs/syslinux +++ b/lfs/syslinux @@ -24,7 +24,7 @@ include Config -VER = 3.62 +VER = 3.86 THISAPP = syslinux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = dd87b380ce0bb67411ce8f21de69b221 +$(DL_FILE)_MD5 = d6fb0231e82190b4932b2aa20274911a install : $(TARGET) diff --git a/lfs/tcl b/lfs/tcl index 6b1e7cf8f6..a62b4e6b05 100644 --- a/lfs/tcl +++ b/lfs/tcl @@ -30,7 +30,12 @@ THISAPP = tcl$(VER) DL_FILE = $(THISAPP)-src.tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) + +ifeq "$(LFS_PASS)" "toolchain" TARGET = $(DIR_INFO)/$(THISAPP)-tools +else +TARGET = $(DIR_INFO)/$(THISAPP) +endif ############################################################################### # Top-level Rules @@ -70,10 +75,18 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) +ifeq "$(LFS_PASS)" "toolchain" cd $(DIR_APP)/unix && ./configure --prefix=/tools --disable-nls +else + cd $(DIR_APP)/unix && ./configure --prefix=/usr --disable-nls +endif cd $(DIR_APP)/unix && make $(MAKETUNING) cd $(DIR_APP)/unix && make install +ifeq "$(LFS_PASS)" "toolchain" cd $(DIR_APP)/unix && make install-private-headers ln -sf tclsh8.4 /tools/bin/tclsh +else + ln -sf tclsh8.4 /usr/bin/tclsh +endif @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/uClibc b/lfs/uClibc deleted file mode 100644 index eeb197884c..0000000000 --- a/lfs/uClibc +++ /dev/null @@ -1,135 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.9.28 - -THISAPP = uClibc-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -ifeq "$(PASS)" "1" - TARGET = $(DIR_INFO)/$(THISAPP)-pass1 -else -ifeq "$(PASS)" "2" - TARGET = $(DIR_INFO)/$(THISAPP)-pass2 -else - TARGET = $(DIR_INFO)/$(THISAPP)-pass3 -endif -endif - -STAGING_DIR=/opt/$(MACHINE)-uClibc - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) uClibc-locale-030818.tgz - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -uClibc-locale-030818.tgz = $(DL_FROM)/uClibc-locale-030818.tgz - -$(DL_FILE)_MD5 = 1ada58d919a82561061e4741fb6abd29 -uClibc-locale-030818.tgz_MD5 = d75b2239b4e27c3c9cbed1c8f6eabba6 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) -ifeq "$(PASS)" "1" - @rm -rf $(DIR_APP) - @mkdir -p /opt/$(MACHINE)-uClibc $(DIR_SRC)/uClibc_dev/usr/include $(DIR_SRC)/uClibc_dev/{,usr}/lib - @cd $(DIR_SRC) && tar xfj $(DIR_DL)/$(DL_FILE) - cp -f $(DIR_DL)/uClibc-locale-030818.tgz $(DIR_APP)/extra/locale/ - cp -f $(DIR_SRC)/config/uClibc/{locales,codesets}.txt $(DIR_APP)/extra/locale - cd $(DIR_APP)/extra/locale && patch -Np3 < $(DIR_SRC)/src/patches/uClibc-gcc4-genwctype.patch - cp -f $(DIR_SRC)/config/uClibc/uClibc.config-$(MACHINE) $(DIR_APP)/.config - cd $(DIR_APP) && make oldconfig - cd $(DIR_APP)/extra/locale && make - cd $(DIR_APP) && make PREFIX=$(DIR_SRC)/uClibc_dev \ - DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=$(DIR_SRC)/uClibc_dev/ \ - pregen install_dev -else -ifeq "$(PASS)" "2" - cd $(DIR_APP) && make PREFIX= \ - DEVEL_PREFIX=/ \ - RUNTIME_PREFIX=/ \ - all - cd $(DIR_APP) && make PREFIX= \ - DEVEL_PREFIX=/opt/$(MACHINE)-uClibc/ \ - RUNTIME_PREFIX=/opt/$(MACHINE)-uClibc/ \ - install_runtime install_dev - - ## This is to fix a small bug - if [ ! -h /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/lib ]; then \ - mv -vf /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/lib/* /opt/$(MACHINE)-uClibc/lib/; \ - rm -rf /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/lib; \ - ln -sfv ../lib /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/lib; \ - fi - - cd $(DIR_APP) && make -C utils/ PREFIX=/opt/$(MACHINE)-uClibc \ - hostutils - cd $(DIR_APP) && make PREFIX=/install/initrd \ - DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=/ \ - install_runtime - cp -f /opt/$(MACHINE)-uClibc/lib/ld-uClibc-$(VER).so /lib - cp -f /opt/$(MACHINE)-uClibc/lib/libuClibc-$(VER).so /lib - cd /lib && ln -sf ld-uClibc-$(VER).so ld-uClibc.so.0 - cd /lib && ln -sf libuClibc-$(VER).so libc.so.0 - cd /lib && ln -sf libc.so.0 libc.so - ln -sf /opt/$(MACHINE)-uClibc/lib/libm-$(VER).so /lib/libm.so.0 -else - cd $(DIR_APP) && make PREFIX=/install/initrd utils install_utils - chmod 755 /install/initrd/lib/libuClibc-$(VER).so - rm -f /install/initrd/lib/{libm*,libcrypt*,libutil*,librt*} - @rm -rf $(DIR_APP) -endif -endif - @$(POSTBUILD) diff --git a/lfs/udev b/lfs/udev index 4667ff4a68..af00187ec8 100644 --- a/lfs/udev +++ b/lfs/udev @@ -24,21 +24,17 @@ include Config -VER = 096 +VER = 125 THISAPP = udev-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) ifeq "$(LFS_PASS)" "install" TARGET = $(DIR_INFO)/$(THISAPP)-install -else -ifeq "$(KLIBC)" "1" - TARGET = $(DIR_INFO)/$(THISAPP)-klibc else TARGET = $(DIR_INFO)/$(THISAPP) endif -endif ############################################################################### # Top-level Rules @@ -49,7 +45,7 @@ objects = $(DL_FILE) udev-config-6.2.tar.bz2 $(DL_FILE) = $(DL_FROM)/$(DL_FILE) udev-config-6.2.tar.bz2 = $(DL_FROM)/udev-config-6.2.tar.bz2 -$(DL_FILE)_MD5 = f4effef7807ce1dc91ab581686ef197b +$(DL_FILE)_MD5 = be98e04cefdd9ca76b8fe7e92735ce29 udev-config-6.2.tar.bz2_MD5 = 9ff2667ab0f7bfe8182966ef690078a0 install : $(TARGET) @@ -79,13 +75,12 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-096-netif_rename.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) ifeq "$(LFS_PASS)" "install" cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/sbin udevdir=/dev cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/sbin udevdir=/dev install rm -f /install/initrd/sbin/udev* /install/initrd/usr/sbin/udev* /install/initrd/usr/bin/udev* - cd $(DIR_APP) && install udevstart udevinfo udevd udevsettle udevtrigger /install/initrd/sbin + cd $(DIR_APP) && install udevadm udevd /install/initrd/sbin cd $(DIR_APP) && make $(MAKETUNING) EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \ extras/firmware extras/floppy extras/path_id \ extras/scsi_id extras/usb_id extras/volume_id" @@ -93,6 +88,7 @@ ifeq "$(LFS_PASS)" "install" extras/firmware extras/floppy extras/path_id \ extras/scsi_id extras/usb_id extras/volume_id" install cd /install/initrd/usr/share && rm -rf man + -mkdir -pv /install/initrd/dev cd /install/initrd/dev && rm -f console cd /install/initrd/dev && mknod -m 0600 console c 5 1 cd /install/initrd/dev && rm -f null @@ -106,31 +102,10 @@ ifeq "$(LFS_PASS)" "install" cd /install/initrd/dev && mknod -m 0600 tty6 c 4 6 cp -f /etc/udev/rules.d/55-scsi-cdrom.rules /install/initrd/etc/udev/rules.d/55-scsi-cdrom.rules -else -ifeq "$(KLIBC)" "1" - cd $(DIR_APP) && sed -i "s|USE_LOG = .*|USE_LOG = false|g" Makefile - cd $(DIR_APP) && sed -i "s|USE_KLIBC = .*|USE_KLIBC = true|g" Makefile - - cd $(DIR_APP) && make PROGRAMS="udevd udevsettle udevtrigger" EXTRAS="extras/firmware extras/cdrom_id" - - -mkdir -p /lib/initcpio/udev - -mkdir -p /lib/initcpio/install - -mkdir -p /lib/initcpio/hooks - cd $(DIR_APP) && install -m755 udevd /lib/initcpio/udev - cd $(DIR_APP) && install -m755 udevtrigger /lib/initcpio/udev - cd $(DIR_APP) && install -m755 udevsettle /lib/initcpio/udev - cd $(DIR_APP) && install -m755 extras/firmware/firmware.sh /lib/initcpio/udev - cd $(DIR_APP) && install -m755 extras/cdrom_id/cdrom_id /lib/initcpio/udev - - install -m755 $(DIR_SRC)/config/mkinitcpio/start_udev /lib/initcpio/udev - install -m644 $(DIR_SRC)/config/mkinitcpio/udev.rules /lib/initcpio/udev - install -m755 $(DIR_SRC)/config/mkinitcpio/load-modules.sh /lib/initcpio/udev - install -m644 $(DIR_SRC)/config/mkinitcpio/udev_install /lib/initcpio/install/udev - install -m644 $(DIR_SRC)/config/mkinitcpio/udev_hook /lib/initcpio/hooks/udev - else rm -rf /lib/udev/devices cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2 + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_persistent-storage-fix.patch install -dv /lib/{firmware,udev/devices/{pts,shm}} echo "Put device firmwares here ..." > /lib/firmware/dirinfo mknod -m0666 /lib/udev/devices/null c 1 3 @@ -154,7 +129,6 @@ else chmod 755 /etc/udev/dvb.sh touch /etc/udev/rules.d/30-persistent-network.rules cp -vf $(DIR_SRC)/config/udev/blacklist /etc/modprobe.d/blacklist -endif endif @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index 7a589cdf61..c64a29a93e 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -24,7 +24,7 @@ include Config -VER = 1.1.2 +VER = 1.1.3 THISAPP = usb-modeswitch-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 071cb300d00938bfe20025c654303d92 +$(DL_FILE)_MD5 = 571e6b81873231246693d18a9912f55d install : $(TARGET) @@ -73,6 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make clean cd $(DIR_APP) && make all $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install - cp -f $(DIR_APP)/usb_modeswitch.setup /etc/usb_modeswitch.setup.example + cp -f $(DIR_APP)/device_reference.txt /etc/usb_modeswitch.setup.example @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/busybox b/lfs/usb_modeswitch_data similarity index 84% rename from lfs/busybox rename to lfs/usb_modeswitch_data index cdea9ef8c0..58ec2f5e52 100644 --- a/lfs/busybox +++ b/lfs/usb_modeswitch_data @@ -24,9 +24,9 @@ include Config -VER = 1.2.2 +VER = 20100707 -THISAPP = busybox-$(VER) +THISAPP = usb-modeswitch-data-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ae8a4c65b9464c8ece3483a3d3b9544c +$(DL_FILE)_MD5 = d1fcc283c64a0877cdcac9cd682052f9 install : $(TARGET) @@ -70,14 +70,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - -mkdir -p /install/initrd/{{,s}bin,etc} - cd $(DIR_APP) && cp -f $(DIR_SRC)/config/uClibc/busybox.config .config - cd $(DIR_APP) && make oldconfig - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make clean + cd $(DIR_APP) && make all $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install - mkdir -p /install/initrd/usr/share/udhcpc - cd $(DIR_APP) && install -m 0755 examples/udhcp/simple.script \ - /install/initrd/usr/share/udhcpc/default.script - ln -svf /tmp/resolv.conf /install/initrd/etc/resolv.conf - @rm -rf $(DIR_APP) /install/initrd/linuxrc + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/xen-image b/lfs/xen-image index a6e4f36428..caef9725fc 100644 --- a/lfs/xen-image +++ b/lfs/xen-image @@ -127,19 +127,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) sed -i -e "s|DEVICE4|/dev/xvda4|g" $(MNThdd)/etc/fstab sed -i -e "s|FSTYPE|ext3|g" $(MNThdd)/etc/fstab - cp -f $(MNThdd)/etc/mkinitcpio.conf $(MNThdd)/etc/mkinitcpio.conf.org - sed -i -e "s| autodetect | |g" $(MNThdd)/etc/mkinitcpio.conf - chroot $(MNThdd) /sbin/mkinitcpio -g /boot/ipfirerd-$(KVER)-xen.img -k $(KVER)-ipfire-xen - cp -f $(MNThdd)/etc/mkinitcpio.conf.org $(MNThdd)/etc/mkinitcpio.conf - - - # Create a script for rebuild-initrd and setup - echo "#!/bin/bash" > $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup - echo "/usr/local/sbin/setup /dev/null INSTALL" >> $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup - echo "rm -f /etc/rc.d/rcsysinit.d/S75firstsetup \\" >> $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup - echo "&& /sbin/reboot" >> $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup - chmod +x $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup + chroot $(MNThdd) /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER)-xen.img $(KVER)-ipfire-xen #Remove root / fstab check rm -rf $(MNThdd)/etc/rc.d/rcsysinit.d/S19checkfstab diff --git a/make.sh b/make.sh index a7cda0919a..453c38001c 100755 --- a/make.sh +++ b/make.sh @@ -24,9 +24,9 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.7" # Version number +VERSION="2.8test" # Version number CORE="40" # Core Level (Filename) -PAKFIRE_CORE="39" # Core Level (PAKFIRE) +PAKFIRE_CORE="40" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -357,7 +357,7 @@ buildipfire() { ipfiremake e1000e XEN=1 ipfiremake linux ipfiremake kqemu - ipfiremake kvm-kmod +# ipfiremake kvm-kmod ipfiremake v4l-dvb ipfiremake madwifi ipfiremake alsa KMOD=1 @@ -373,9 +373,10 @@ buildipfire() { ipfiremake pkg-config ipfiremake linux-atm ipfiremake cpio - ipfiremake klibc - ipfiremake mkinitcpio - ipfiremake udev KLIBC=1 + + installmake strip + + ipfiremake dracut ipfiremake expat ipfiremake gdbm ipfiremake gmp @@ -637,12 +638,14 @@ buildipfire() { ipfiremake asterisk ipfiremake lcr ipfiremake usb_modeswitch + ipfiremake usb_modeswitch_data ipfiremake zerofree ipfiremake mdadm ipfiremake eject ipfiremake pound ipfiremake minicom ipfiremake ddrescue + ipfiremake tcl echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -666,34 +669,9 @@ 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 + ipfiremake installer + installmake strip + ipfiremake initrd } buildpackages() { @@ -701,7 +679,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 diff --git a/src/dracut/dracut.conf b/src/dracut/dracut.conf new file mode 100644 index 0000000000..a37038eb3c --- /dev/null +++ b/src/dracut/dracut.conf @@ -0,0 +1,26 @@ +# dracut config file + +# Specific list of dracut modules to use +#dracutmodules+="" + +# Dracut modules to omit +#omit_dracutmodules+="" + +# Dracut modules to add to the default +#add_dracutmodules+="" + +# additional kernel modules to the default +#add_drivers+="" + +# list of kernel filesystem modules to be included in the generic initramfs +filesystems+="ext2 ext3 reiserfs reiser4 iso9660 vfat" + +# build initrd only to boot current hardware +#hostonly="yes" +# + +# install local /etc/mdadm.conf +mdadmconf="no" + +# install local /etc/lvm/lvm.conf +lvmconf="no" diff --git a/src/dracut/switch_root.c b/src/dracut/switch_root.c new file mode 100644 index 0000000000..1520387239 --- /dev/null +++ b/src/dracut/switch_root.c @@ -0,0 +1,188 @@ +/* + * switchroot.c - switch to new root directory and start init. + * + * Copyright 2002-2008 Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Authors: + * Peter Jones + * Jeremy Katz + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef MS_MOVE +#define MS_MOVE 8192 +#endif + +enum { + ok, + err_no_directory, + err_usage, +}; + +/* remove all files/directories below dirName -- don't cross mountpoints */ +static int +recursiveRemove(char * dirName) +{ + struct stat sb,rb; + DIR * dir; + struct dirent * d; + char * strBuf = alloca(strlen(dirName) + 1024); + + if (!(dir = opendir(dirName))) { + printf("error opening %s: %m\n", dirName); + return 0; + } + + if (fstat(dirfd(dir),&rb)) { + printf("unable to stat %s: %m\n", dirName); + closedir(dir); + return 0; + } + + errno = 0; + + while ((d = readdir(dir))) { + errno = 0; + + if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) { + errno = 0; + continue; + } + + strcpy(strBuf, dirName); + strcat(strBuf, "/"); + strcat(strBuf, d->d_name); + + if (lstat(strBuf, &sb)) { + printf("failed to stat %s: %m\n", strBuf); + errno = 0; + continue; + } + + /* only descend into subdirectories if device is same as dir */ + if (S_ISDIR(sb.st_mode)) { + if (sb.st_dev == rb.st_dev) { + recursiveRemove(strBuf); + if (rmdir(strBuf)) + printf("failed to rmdir %s: %m\n", strBuf); + } + errno = 0; + continue; + } + if (unlink(strBuf)) { + printf("failed to remove %s: %m\n", strBuf); + errno = 0; + continue; + } + } + + if (errno) { + closedir(dir); + printf("error reading from %s: %m\n", dirName); + return 1; + } + + closedir(dir); + return 0; +} + +static int switchroot(const char *newroot) +{ + /* Don't try to unmount the old "/", there's no way to do it. */ + const char *umounts[] = { "/dev", "/proc", "/sys", NULL }; + int errnum; + int i; + + for (i = 0; umounts[i] != NULL; i++) { + char newmount[PATH_MAX]; + strcpy(newmount, newroot); + strcat(newmount, umounts[i]); + if (mount(umounts[i], newmount, NULL, MS_MOVE, NULL) < 0) { + fprintf(stderr, "Error mount moving old %s %s %m\n", + umounts[i], newmount); + fprintf(stderr, "Forcing unmount of %s\n", umounts[i]); + umount2(umounts[i], MNT_FORCE); + } + } + + if (chdir(newroot) < 0) { + errnum=errno; + fprintf(stderr, "switchroot: chdir failed: %m\n"); + errno=errnum; + return -1; + } + recursiveRemove("/"); + if (mount(newroot, "/", NULL, MS_MOVE, NULL) < 0) { + errnum = errno; + fprintf(stderr, "switchroot: mount failed: %m\n"); + errno = errnum; + return -1; + } + + if (chroot(".")) { + errnum = errno; + fprintf(stderr, "switchroot: chroot failed: %m\n"); + errno = errnum; + return -2; + } + return 1; +} + +static void usage(FILE *output) +{ + fprintf(output, "usage: switchroot \n"); + if (output == stderr) + exit(err_usage); + exit(ok); +} + +int main(int argc, char *argv[]) +{ + char *newroot = argv[1]; + char *init = argv[2]; + char **initargs = &argv[2]; + + if (newroot == NULL || newroot[0] == '\0' || + init == NULL || init[0] == '\0' ) { + usage(stderr); + } + + if (switchroot(newroot) < 0) { + fprintf(stderr, "switchroot has failed. Sorry.\n"); + return 1; + } + if (access(initargs[0], X_OK)) + fprintf(stderr, "WARNING: can't access %s\n", initargs[0]); + + /* get session leader */ + setsid(); + /* set controlling terminal */ + ioctl (0, TIOCSCTTY, 1); + + execv(initargs[0], initargs); +} + diff --git a/src/initscripts/init.d/checkfstab b/src/initscripts/init.d/checkfstab index c216da6f6e..2fe80bf31d 100644 --- a/src/initscripts/init.d/checkfstab +++ b/src/initscripts/init.d/checkfstab @@ -17,7 +17,12 @@ case "${1}" in start) + #Skip if root is set by UUID + if (grep "root=UUID=" /proc/cmdline); then + exit 0; + fi boot_mesg "Checking fstab bootdevice ..." + read CMDLINE < /proc/cmdline ROOTPOS=`expr index "$CMDLINE" root=` NEWROOT=`echo ${CMDLINE:$ROOTPOS} | cut -d"=" -f2 | cut -d" " -f1`; OLDBOOT=`cat /etc/fstab | grep -m1 "/boot" | cut -d" " -f1 | cut -f1`; diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup new file mode 100644 index 0000000000..cef0b8a037 --- /dev/null +++ b/src/initscripts/init.d/firstsetup @@ -0,0 +1,9 @@ +#!/bin/bash +export LANG=en_US.utf8 +/usr/local/sbin/setup /dev/tty2 INSTALL +echo Restarting udev... +killall udevd +/sbin/udevd --daemon +/sbin/udevadm trigger +/sbin/udevadm settle +rm -f /etc/rc.d/rcsysinit.d/S75firstsetup diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev index 0cb97cd0a6..03846e6f3a 100644 --- a/src/initscripts/init.d/udev +++ b/src/initscripts/init.d/udev @@ -60,10 +60,10 @@ case "${1}" in # Now traverse /sys in order to "coldplug" devices that have # already been discovered - /sbin/udevtrigger + /sbin/udevadm trigger # Now wait for udevd to process the uevents we triggered - /sbin/udevsettle + /sbin/udevadm settle evaluate_retval ;; diff --git a/src/initscripts/init.d/udev_retry b/src/initscripts/init.d/udev_retry index 82f05808f6..78461ce77e 100644 --- a/src/initscripts/init.d/udev_retry +++ b/src/initscripts/init.d/udev_retry @@ -26,7 +26,7 @@ case "${1}" in done 2>/dev/null # Now wait for udevd to process the uevents we triggered - /sbin/udevsettle + /sbin/udevadm settle evaluate_retval ;; diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 9cf1bd5e37..a46de921f7 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -108,31 +108,10 @@ int main(int argc, char *argv[]) } } - // Load ata-piix prior kudzu because kudzu use ata-generic for ich7 - mysystem("/sbin/modprobe ata_piix"); - - // Starting hardware detection - 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 iso9660"); // CDROM mysystem("/sbin/modprobe ext2"); // Boot patition mysystem("/sbin/modprobe vfat"); // USB key - - runcommandwithstatus("/bin/sleep 10", "Waiting for USB Hardware ..."); /* German is the default */ for (choice = 0; langnames[choice]; choice++) @@ -231,11 +210,6 @@ int main(int argc, char *argv[]) sprintf(hdparams.devnode_part, "/dev/%s%s", harddrive,raid_disk ? "p" : ""); /* Now the names after the machine is booted. Only scsi is affected and we only install on the first scsi disk. */ - { char tmp[30]; - strcpy(tmp, scsi_disk ? "sda" : harddrive); - sprintf(hdparams.devnode_disk_run, "/dev/%s", tmp); - sprintf(hdparams.devnode_part_run, "/dev/%s%s", tmp, raid_disk ? "p" : ""); - } fprintf(flog, "Destination drive: %s\n", hdparams.devnode_disk); @@ -288,7 +262,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 +334,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 +343,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]); @@ -441,7 +415,7 @@ int main(int argc, char *argv[]) } snprintf(commandstring, STRING_SIZE, - "/bin/tar -C /harddisk -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma"); + "/bin/tar -C /harddisk -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma 2>/dev/null"); if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT, ctr[TR_INSTALLING_FILES])) @@ -453,17 +427,6 @@ 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); -/* snprintf(commandstring, STRING_SIZE, - "/bin/touch /harddisk/lib/modules/%s-ipfire-smp/modules.dep", - KERNEL_VERSION); - mysystem(commandstring); -*/ - /* Rename uname */ rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname"); @@ -474,7 +437,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]); @@ -482,8 +445,15 @@ int main(int argc, char *argv[]) } /* Update /etc/fstab */ - replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run); - + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE1#UUID=$(/sbin/blkid %s1 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part); + system(commandstring); + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE2#UUID=$(/sbin/blkid %s2 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part); + system(commandstring); + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE3#UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part); + system(commandstring); + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE4#UUID=$(/sbin/blkid %s4 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part); + system(commandstring); + if (fstype == EXT2) { replace("/harddisk/etc/fstab", "FSTYPE", "ext2"); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); @@ -491,20 +461,6 @@ 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; - } replace("/harddisk/etc/fstab", "FSTYPE", "ext3"); NOJOURNAL: replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); @@ -512,40 +468,15 @@ int main(int argc, char *argv[]) replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION); - /* Build the emergency ramdisk with all drivers */ - mysystem("cp -f /harddisk/etc/mkinitcpio.conf /harddisk/etc/mkinitcpio.conf.org"); - - replace("/harddisk/etc/mkinitcpio.conf", " autodetect ", " "); - snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-emergency.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION); - runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]); - - mysystem("cp -f /harddisk/etc/mkinitcpio.conf.org /harddisk/etc/mkinitcpio.conf"); - - /* mkinitcpio has a problem if ide and pata are included */ - if ( scsi_disk==1 ) { - /* Remove the ide hook if we install sda */ - replace("/harddisk/etc/mkinitcpio.conf", " ide ", " "); - } else { - /* Remove the pata & sata hook if we install hda */ - replace("/harddisk/etc/mkinitcpio.conf", " pata ", " "); - replace("/harddisk/etc/mkinitcpio.conf", " sata ", " "); - } - /* Going to make our initrd... */ - snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION); - runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]); -/* snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-smp.img -k %s-ipfire-smp", KERNEL_VERSION, KERNEL_VERSION ); - runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]); -*/ - + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#root=ROOT#root=UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/boot/grub/grub.conf", hdparams.devnode_part); + system(commandstring); - 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"); - system("sed -e 's#/harddisk#/#g' -e 's#//#/#g' < /proc/mounts > /harddisk/etc/mtab"); + system("/bin/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; @@ -560,7 +491,7 @@ int main(int argc, char *argv[]) } mysystem("umount /cdrom"); - snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive); + snprintf(commandstring, STRING_SIZE, "/usr/bin/eject /dev/%s", sourcedrive); mysystem(commandstring); if (!unattended) { @@ -596,10 +527,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"); @@ -624,8 +555,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/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index eb2285b1e0..68c36ea006 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.15 +KVER=2.6.32.19 ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden diff --git a/src/paks/nut/install.sh b/src/paks/nut/install.sh index d117ad88fc..7b9fe15e60 100644 --- a/src/paks/nut/install.sh +++ b/src/paks/nut/install.sh @@ -26,8 +26,6 @@ extract_files restore_backup ${NAME} -groupadd nut - ln -svf ../init.d/nut /etc/rc.d/rc0.d/K20nut ln -svf ../init.d/nut /etc/rc.d/rc3.d/S20nut ln -svf ../init.d/nut /etc/rc.d/rc6.d/K20nut diff --git a/src/patches/dracut-006_lzma.patch b/src/patches/dracut-006_lzma.patch new file mode 100644 index 0000000000..ddf4991545 --- /dev/null +++ b/src/patches/dracut-006_lzma.patch @@ -0,0 +1,14 @@ +diff -Naur dracut-006.org/dracut dracut-006/dracut +--- dracut-006.org/dracut 2010-06-17 10:46:29.000000000 +0200 ++++ dracut-006/dracut 2010-08-07 21:00:38.000000000 +0200 +@@ -308,9 +308,7 @@ + #strip -R .comment $note "$f" || : + done + fi +- +-type pigz &>/dev/null && gzip=pigz || gzip=gzip +-( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet |$gzip -9 > "$outfile"; ) ++( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet | lzma > "$outfile"; ) + if [ $? -ne 0 ]; then + derror "dracut: creation of $outfile failed" + exit 1 diff --git a/src/patches/dracut-init_start_ipfireinstaller.patch b/src/patches/dracut-init_start_ipfireinstaller.patch new file mode 100644 index 0000000000..0103826525 --- /dev/null +++ b/src/patches/dracut-init_start_ipfireinstaller.patch @@ -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" diff --git a/src/patches/udev-096-netif_rename.patch b/src/patches/udev-096-netif_rename.patch deleted file mode 100644 index 1249c05836..0000000000 --- a/src/patches/udev-096-netif_rename.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naur udev-096.org/udev_device.c udev-096/udev_device.c ---- udev-096.org/udev_device.c 2006-07-09 21:48:19.000000000 +0200 -+++ udev-096/udev_device.c 2009-04-28 22:04:56.000000000 +0200 -@@ -102,40 +102,8 @@ - strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ); - retval = ioctl(sk, SIOCSIFNAME, &ifr); - if (retval != 0) { -- int loop; -- -- /* see if the destination interface name already exists */ -- if (errno != EEXIST) { -- err("error changing netif name: %s", strerror(errno)); -- goto exit; -- } -- -- /* free our own name, another process may wait for us */ -- strlcpy(ifr.ifr_newname, udev->dev->kernel_name, IFNAMSIZ); -- strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ); -- retval = ioctl(sk, SIOCSIFNAME, &ifr); -- if (retval != 0) { -- err("error changing netif name: %s", strerror(errno)); -- goto exit; -- } -- -- /* wait 30 seconds for our target to become available */ -- strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ); -- strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ); -- loop = 30 * 20; -- while (loop--) { -- retval = ioctl(sk, SIOCSIFNAME, &ifr); -- if (retval != 0) { -- if (errno != EEXIST) { -- err("error changing net interface name: %s", strerror(errno)); -- break; -- } -- dbg("wait for netif '%s' to become free, loop=%i", udev->name, (30 * 20) - loop); -- usleep(1000 * 1000 / 20); -- } -- } -+ err("error changing netif name: %s", strerror(errno)); - } -- - exit: - close(sk); - return retval; diff --git a/src/patches/udev-125-netif_rename.patch b/src/patches/udev-125-netif_rename.patch new file mode 100644 index 0000000000..c80b05afc3 --- /dev/null +++ b/src/patches/udev-125-netif_rename.patch @@ -0,0 +1,47 @@ +diff -Nur udev-125.vanilla/udev_device.c udev-125/udev_device.c +--- udev-125.vanilla/udev_device.c 2008-07-18 16:26:55.000000000 +0200 ++++ udev-125/udev_device.c 2010-07-25 18:15:12.289242450 +0200 +@@ -123,42 +123,7 @@ + if (retval == 0) + kernel_log(ifr); + else { +- int loop; +- +- /* see if the destination interface name already exists */ +- if (errno != EEXIST) { +- err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno)); +- goto exit; +- } +- +- /* free our own name, another process may wait for us */ +- strlcpy(ifr.ifr_newname, udev->dev->kernel, IFNAMSIZ); +- strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ); +- retval = ioctl(sk, SIOCSIFNAME, &ifr); +- if (retval != 0) { +- err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno)); +- goto exit; +- } +- +- /* wait 30 seconds for our target to become available */ +- strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ); +- strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ); +- loop = 30 * 20; +- while (loop--) { +- retval = ioctl(sk, SIOCSIFNAME, &ifr); +- if (retval == 0) { +- kernel_log(ifr); +- break; +- } +- +- if (errno != EEXIST) { +- err("error changing net interface name %s to %s: %s\n", +- ifr.ifr_name, ifr.ifr_newname, strerror(errno)); +- break; +- } +- dbg("wait for netif '%s' to become free, loop=%i\n", udev->name, (30 * 20) - loop); +- usleep(1000 * 1000 / 20); +- } ++ err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno)); + } + + exit: diff --git a/src/patches/udev-config-6.2_persistent-storage-fix.patch b/src/patches/udev-config-6.2_persistent-storage-fix.patch new file mode 100644 index 0000000000..172091a4db --- /dev/null +++ b/src/patches/udev-config-6.2_persistent-storage-fix.patch @@ -0,0 +1,12 @@ +diff -Naur udev-config-6.2.org/60-persistent-storage.rules udev-config-6.2/60-persistent-storage.rules +--- udev-config-6.2.org/60-persistent-storage.rules 2006-05-13 01:03:13.000000000 +0200 ++++ udev-config-6.2/60-persistent-storage.rules 2010-08-14 11:08:35.000000000 +0200 +@@ -9,7 +9,7 @@ + + # 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" ++KERNEL=="hd*[0-9]", SYSFS{removable}=="1", GOTO="persistent_storage_end" + + # for partitions import parent information + KERNEL=="*[0-9]", IMPORT{parent}=="ID_*" diff --git a/src/scripts/rebuild-initrd b/src/scripts/rebuild-initrd index 79ec1c36d7..06f30bbf05 100644 --- a/src/scripts/rebuild-initrd +++ b/src/scripts/rebuild-initrd @@ -23,21 +23,5 @@ # # KVER=`uname -r | cut -d"-" -f1` -ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` -echo -echo Rebuild the Initramdisk ... -cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf -# -# Made initramdisk -# -if [ "${ROOT:0:7}" == "/dev/sd" ]; then - # Remove ide hook if root is on sda - sed -i "s| ide | |g" /etc/mkinitcpio.conf -else -if [ "${ROOT:0:7}" == "/dev/hd" ]; then - # Remove pata & sata hook if root is on hda - sed -i "s| pata | |g" /etc/mkinitcpio.conf - sed -i "s| sata | |g" /etc/mkinitcpio.conf -fi -fi -mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img + +dracut --force --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire