From: Michael Tremer Date: Mon, 18 May 2009 13:15:31 +0000 (+0200) Subject: Rootfile update. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d3aa3744f6aa511117a2a60e96b12b3127626e;p=ipfire-3.x.git Rootfile update. --- diff --git a/src/rootfiles/core/bash b/src/rootfiles/core/bash index 21afec94a..495b1d6d1 100644 --- a/src/rootfiles/core/bash +++ b/src/rootfiles/core/bash @@ -1,4 +1,14 @@ #bin/bashbug +etc/bashrc +etc/inputrc +etc/profile +etc/profile.d +etc/profile.d/dircolors.sh +etc/profile.d/extrapaths.sh +etc/profile.d/i18n.sh +etc/profile.d/readline.sh +etc/profile.d/umask.sh +etc/shells #usr/share/doc/bash-4.0 #usr/share/doc/bash-4.0/bash.html #usr/share/doc/bash-4.0/bashref.html diff --git a/src/rootfiles/core/dbus b/src/rootfiles/core/dbus index 5283b4a6e..7ab33adca 100644 --- a/src/rootfiles/core/dbus +++ b/src/rootfiles/core/dbus @@ -3,6 +3,7 @@ etc/dbus-1/session.conf etc/dbus-1/session.d etc/dbus-1/system.conf etc/dbus-1/system.d +etc/init.d/messagebus usr/bin/dbus-cleanup-sockets usr/bin/dbus-daemon usr/bin/dbus-launch diff --git a/src/rootfiles/core/fcron b/src/rootfiles/core/fcron index 943442fa7..a1be80ce2 100644 --- a/src/rootfiles/core/fcron +++ b/src/rootfiles/core/fcron @@ -7,6 +7,7 @@ etc/fcron.hourly etc/fcron.minutely etc/fcron.monthly etc/fcron.weekly +etc/init.d/fcron etc/pam.d/fcron etc/pam.d/fcrontab #usr/bin/fcrondyn diff --git a/src/rootfiles/core/firewall b/src/rootfiles/core/firewall index 2c0aff41e..fa28a7103 100644 --- a/src/rootfiles/core/firewall +++ b/src/rootfiles/core/firewall @@ -1,3 +1,4 @@ +etc/init.d/firewall usr/bin/firewall usr/lib/firewall usr/lib/firewall/functions diff --git a/src/rootfiles/core/glibc b/src/rootfiles/core/glibc index ccd97aafd..a9e156482 100644 --- a/src/rootfiles/core/glibc +++ b/src/rootfiles/core/glibc @@ -1,5 +1,7 @@ etc/ld.so.cache +etc/ld.so.conf etc/localtime +etc/nsswitch.conf #etc/rpc lib/ld-2.9.so lib/ld-linux.so.2 diff --git a/src/rootfiles/core/hal b/src/rootfiles/core/hal index 62c53c49c..f1975bb91 100644 --- a/src/rootfiles/core/hal +++ b/src/rootfiles/core/hal @@ -4,7 +4,7 @@ etc/hal/fdi etc/hal/fdi/information etc/hal/fdi/policy etc/hal/fdi/preprobe -lib/udev/rules.d/90-hal.rules +etc/init.d/haldaemon usr/bin/hal-device usr/bin/hal-disable-polling usr/bin/hal-find-by-capability @@ -35,6 +35,7 @@ usr/lib/hal/hald-addon-hid-ups usr/lib/hal/hald-addon-imac-backlight usr/lib/hal/hald-addon-input usr/lib/hal/hald-addon-ipw-killswitch +usr/lib/hal/hald-addon-leds usr/lib/hal/hald-addon-macbook-backlight usr/lib/hal/hald-addon-macbookpro-backlight usr/lib/hal/hald-addon-pmu @@ -145,6 +146,7 @@ usr/share/hal/fdi/policy/10osvendor/10-dockstation.fdi usr/share/hal/fdi/policy/10osvendor/10-imac-backlight.fdi usr/share/hal/fdi/policy/10osvendor/10-input-policy.fdi usr/share/hal/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi +usr/share/hal/fdi/policy/10osvendor/10-leds.fdi usr/share/hal/fdi/policy/10osvendor/10-macbook-backlight.fdi usr/share/hal/fdi/policy/10osvendor/10-macbookpro-utils.fdi usr/share/hal/fdi/policy/10osvendor/10-power-mgmt-policy.fdi diff --git a/src/rootfiles/core/initscripts b/src/rootfiles/core/initscripts index e1095737f..531159c00 100644 --- a/src/rootfiles/core/initscripts +++ b/src/rootfiles/core/initscripts @@ -1,19 +1,12 @@ -etc/init.d etc/init.d/boottemp etc/init.d/checkfs etc/init.d/cleanfs -etc/init.d/fcron -etc/init.d/firewall -etc/init.d/haldaemon etc/init.d/halt etc/init.d/ipfire-functions -etc/init.d/lighttpd etc/init.d/localnet -etc/init.d/messagebus etc/init.d/modules etc/init.d/mountfs etc/init.d/mountkernfs -etc/init.d/network etc/init.d/networking etc/init.d/networking/functions etc/init.d/networking/hooks @@ -28,7 +21,6 @@ etc/init.d/networking/hooks/vlan etc/init.d/networking/net-hotplug etc/init.d/networking/port etc/init.d/networking/zone -etc/init.d/openldap etc/init.d/random etc/init.d/rc etc/init.d/reboot @@ -36,7 +28,6 @@ etc/init.d/sendsignals etc/init.d/setclock etc/init.d/swap etc/init.d/sysctl -etc/init.d/syslog-ng #etc/init.d/template etc/init.d/udev etc/init.d/udev_retry @@ -44,72 +35,26 @@ etc/lsb etc/lsb/lsb-config etc/lsb/state etc/rc0.d -etc/rc0.d/K88random -etc/rc0.d/K89openldap -etc/rc0.d/K90lighttpd -etc/rc0.d/K91network -etc/rc0.d/K92haldaemon -etc/rc0.d/K93messagebus etc/rc0.d/K94syslog-ng -etc/rc0.d/K95sendsignals -etc/rc0.d/K96mountfs -etc/rc0.d/K97swap -etc/rc0.d/K98localnet -etc/rc0.d/K99firewall +etc/rc0.d/K95random +etc/rc0.d/K96sendsignals +etc/rc0.d/K97mountfs +etc/rc0.d/K98swap +etc/rc0.d/K99localnet etc/rc0.d/S00halt etc/rc1.d -etc/rc1.d/K93openldap -etc/rc1.d/K94lighttpd -etc/rc1.d/K95network -etc/rc1.d/K96haldaemon -etc/rc1.d/K97messagebus -etc/rc1.d/K98syslog-ng -etc/rc1.d/K99firewall +etc/rc1.d/K99syslog-ng etc/rc2.d -etc/rc2.d/K96openldap -etc/rc2.d/K97lighttpd -etc/rc2.d/K98network -etc/rc2.d/K99firewall -etc/rc2.d/S00syslog-ng -etc/rc2.d/S01messagebus -etc/rc2.d/S02haldaemon etc/rc3.d -etc/rc3.d/S00syslog-ng -etc/rc3.d/S01network -etc/rc3.d/S02firewall -etc/rc3.d/S03messagebus -etc/rc3.d/S04haldaemon -etc/rc3.d/S05lighttpd -etc/rc3.d/S06openldap etc/rc4.d -etc/rc4.d/S00syslog-ng -etc/rc4.d/S01network -etc/rc4.d/S02firewall -etc/rc4.d/S03messagebus -etc/rc4.d/S04haldaemon -etc/rc4.d/S05lighttpd -etc/rc4.d/S06openldap etc/rc5.d -etc/rc5.d/S00syslog-ng -etc/rc5.d/S01network -etc/rc5.d/S02firewall -etc/rc5.d/S03messagebus -etc/rc5.d/S04haldaemon -etc/rc5.d/S05lighttpd -etc/rc5.d/S06openldap etc/rc6.d -etc/rc6.d/K88random -etc/rc6.d/K89openldap -etc/rc6.d/K90lighttpd -etc/rc6.d/K91network -etc/rc6.d/K92haldaemon -etc/rc6.d/K93messagebus etc/rc6.d/K94syslog-ng -etc/rc6.d/K95sendsignals -etc/rc6.d/K96mountfs -etc/rc6.d/K97swap -etc/rc6.d/K98localnet -etc/rc6.d/K99firewall +etc/rc6.d/K95random +etc/rc6.d/K96sendsignals +etc/rc6.d/K97mountfs +etc/rc6.d/K98swap +etc/rc6.d/K99localnet etc/rc6.d/S00reboot etc/rcS.d etc/rcS.d/S00mountkernfs @@ -131,6 +76,7 @@ etc/sysconfig/network etc/sysconfig/rc etc/sysconfig/rc.local etc/sysconfig/rc.site +etc/sysctl.conf lib/lsb lib/lsb/init-functions lib/lsb/manage-functions diff --git a/src/rootfiles/core/lighttpd b/src/rootfiles/core/lighttpd index e276f5224..87c9fb878 100644 --- a/src/rootfiles/core/lighttpd +++ b/src/rootfiles/core/lighttpd @@ -1,3 +1,4 @@ +etc/init.d/lighttpd etc/lighttpd.conf #usr/bin/spawn-fcgi usr/lib/lighttpd diff --git a/src/rootfiles/core/module-init-tools b/src/rootfiles/core/module-init-tools index bf873e9f2..283b4ea27 100644 --- a/src/rootfiles/core/module-init-tools +++ b/src/rootfiles/core/module-init-tools @@ -1,4 +1,7 @@ bin/lsmod +etc/modprobe.d +etc/modprobe.d/blacklist.conf +etc/modprobe.d/modprobe.conf sbin/depmod sbin/generate-modprobe.conf sbin/insmod diff --git a/src/rootfiles/core/network b/src/rootfiles/core/network index 574095804..ecc4cb922 100644 --- a/src/rootfiles/core/network +++ b/src/rootfiles/core/network @@ -1 +1,2 @@ +etc/init.d/network usr/bin/network diff --git a/src/rootfiles/core/nfs-utils b/src/rootfiles/core/nfs-utils new file mode 100644 index 000000000..832cd5f45 --- /dev/null +++ b/src/rootfiles/core/nfs-utils @@ -0,0 +1,41 @@ +sbin/mount.nfs +sbin/mount.nfs4 +sbin/umount.nfs +sbin/umount.nfs4 +usr/sbin/exportfs +usr/sbin/nfsstat +usr/sbin/rpc.idmapd +usr/sbin/rpc.mountd +usr/sbin/rpc.nfsd +usr/sbin/rpc.statd +usr/sbin/rpcdebug +usr/sbin/showmount +usr/sbin/sm-notify +usr/sbin/start-statd +#usr/share/man/man5/exports.5 +#usr/share/man/man5/idmapd.conf.5 +#usr/share/man/man5/nfs.5 +#usr/share/man/man7/nfsd.7 +#usr/share/man/man8/exportfs.8 +#usr/share/man/man8/idmapd.8 +#usr/share/man/man8/mount.nfs.8 +#usr/share/man/man8/mountd.8 +#usr/share/man/man8/nfsd.8 +#usr/share/man/man8/nfsstat.8 +#usr/share/man/man8/rpc.idmapd.8 +#usr/share/man/man8/rpc.mountd.8 +#usr/share/man/man8/rpc.nfsd.8 +#usr/share/man/man8/rpc.sm-notify.8 +#usr/share/man/man8/rpc.statd.8 +#usr/share/man/man8/rpcdebug.8 +#usr/share/man/man8/showmount.8 +#usr/share/man/man8/sm-notify.8 +#usr/share/man/man8/statd.8 +#usr/share/man/man8/umount.nfs.8 +var/lib/nfs +var/lib/nfs/etab +var/lib/nfs/rmtab +var/lib/nfs/sm +var/lib/nfs/sm.bak +var/lib/nfs/state +var/lib/nfs/xtab diff --git a/src/rootfiles/core/openldap b/src/rootfiles/core/openldap index 5ade106c9..68db782b1 100644 --- a/src/rootfiles/core/openldap +++ b/src/rootfiles/core/openldap @@ -1,3 +1,4 @@ +etc/init.d/openldap etc/openldap #etc/openldap/DB_CONFIG.example etc/openldap/ldap.conf diff --git a/src/rootfiles/core/pam b/src/rootfiles/core/pam index 8ffa23eea..8d081ea2b 100644 --- a/src/rootfiles/core/pam +++ b/src/rootfiles/core/pam @@ -3,6 +3,7 @@ etc/environment etc/pam.d etc/pam.d/other etc/pam.d/system-auth +etc/securetty etc/security etc/security/access.conf etc/security/group.conf diff --git a/src/rootfiles/core/portmap b/src/rootfiles/core/portmap new file mode 100644 index 000000000..068262d2f --- /dev/null +++ b/src/rootfiles/core/portmap @@ -0,0 +1,6 @@ +sbin/pmap_dump +sbin/pmap_set +sbin/portmap +#usr/share/man/man8/pmap_dump.8 +#usr/share/man/man8/pmap_set.8 +#usr/share/man/man8/portmap.8 diff --git a/src/rootfiles/core/python-pyblock b/src/rootfiles/core/python-pyblock index d1d727150..44d61180c 100644 --- a/src/rootfiles/core/python-pyblock +++ b/src/rootfiles/core/python-pyblock @@ -10,5 +10,5 @@ usr/lib/python2.6/site-packages/block/dmraidmodule.so usr/lib/python2.6/site-packages/block/maps.py usr/lib/python2.6/site-packages/block/maps.pyc usr/lib/python2.6/site-packages/block/maps.pyo -#usr/share/doc/pyblock-0.42 -#usr/share/doc/pyblock-0.42/COPYING +#usr/share/doc/pyblock-0.34 +#usr/share/doc/pyblock-0.34/COPYING diff --git a/src/rootfiles/core/stage2 b/src/rootfiles/core/stage2 index 44c6eb065..ab171ee28 100644 --- a/src/rootfiles/core/stage2 +++ b/src/rootfiles/core/stage2 @@ -1,41 +1,16 @@ boot -etc/bashrc etc/certparams -etc/fstab etc/group etc/grsec etc/grsec/sysctl.conf -etc/hddtemp.db etc/host.conf -etc/inittab -etc/inputrc -etc/ipfire-release -etc/issue -etc/ld.so.conf etc/logrotate.conf -etc/mime.types -etc/modprobe.d -etc/modprobe.d/blacklist.conf -etc/modprobe.d/modprobe.conf etc/modules.conf etc/mtab -etc/nsswitch.conf #etc/opt etc/passwd -etc/profile -etc/profile.d -etc/profile.d/dircolors.sh -etc/profile.d/extrapaths.sh -etc/profile.d/i18n.sh -etc/profile.d/readline.sh -etc/profile.d/umask.sh etc/resolv.conf -etc/securetty -etc/shells etc/sysconfig -etc/sysctl.conf -etc/syslog.conf -etc/system-release home home/nobody lib diff --git a/src/rootfiles/core/syslinux b/src/rootfiles/core/syslinux index 4354ed899..6a291143f 100644 --- a/src/rootfiles/core/syslinux +++ b/src/rootfiles/core/syslinux @@ -9,13 +9,18 @@ #usr/bin/sha1pass #usr/bin/syslinux #usr/bin/syslinux2ansi +#usr/share/man/man1/extlinux.1 #usr/share/man/man1/gethostip.1 #usr/share/man/man1/lss16toppm.1 #usr/share/man/man1/ppmtolss16.1 #usr/share/man/man1/syslinux.1 #usr/share/man/man1/syslinux2ansi.1 #usr/share/syslinux +#usr/share/syslinux/altmbr.bin +#usr/share/syslinux/altmbr_c.bin +#usr/share/syslinux/altmbr_f.bin #usr/share/syslinux/chain.c32 +#usr/share/syslinux/cmd.c32 #usr/share/syslinux/com32 #usr/share/syslinux/com32/com32.ld #usr/share/syslinux/com32/include @@ -31,20 +36,28 @@ #usr/share/syslinux/com32/include/com32.h #usr/share/syslinux/com32/include/console.h #usr/share/syslinux/com32/include/cpufeature.h -#usr/share/syslinux/com32/include/cpuid.h #usr/share/syslinux/com32/include/ctype.h #usr/share/syslinux/com32/include/dev.h -#usr/share/syslinux/com32/include/dmi -#usr/share/syslinux/com32/include/dmi/dmi.h -#usr/share/syslinux/com32/include/dmi/dmi_base_board.h -#usr/share/syslinux/com32/include/dmi/dmi_bios.h -#usr/share/syslinux/com32/include/dmi/dmi_chassis.h -#usr/share/syslinux/com32/include/dmi/dmi_processor.h -#usr/share/syslinux/com32/include/dmi/dmi_system.h +#usr/share/syslinux/com32/include/dirent.h #usr/share/syslinux/com32/include/elf.h #usr/share/syslinux/com32/include/endian.h #usr/share/syslinux/com32/include/errno.h #usr/share/syslinux/com32/include/fcntl.h +#usr/share/syslinux/com32/include/gplinclude +#usr/share/syslinux/com32/include/gplinclude/README +#usr/share/syslinux/com32/include/gplinclude/cpuid.h +#usr/share/syslinux/com32/include/gplinclude/dmi +#usr/share/syslinux/com32/include/gplinclude/dmi/dmi.h +#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_base_board.h +#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_battery.h +#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_bios.h +#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_chassis.h +#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_ipmi.h +#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_memory.h +#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_processor.h +#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_system.h +#usr/share/syslinux/com32/include/gplinclude/vpd +#usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h #usr/share/syslinux/com32/include/inttypes.h #usr/share/syslinux/com32/include/klibc #usr/share/syslinux/com32/include/klibc/archsetjmp.h @@ -83,6 +96,7 @@ #usr/share/syslinux/com32/include/syslinux #usr/share/syslinux/com32/include/syslinux/adv.h #usr/share/syslinux/com32/include/syslinux/advconst.h +#usr/share/syslinux/com32/include/syslinux/align.h #usr/share/syslinux/com32/include/syslinux/boot.h #usr/share/syslinux/com32/include/syslinux/bootpm.h #usr/share/syslinux/com32/include/syslinux/bootrm.h @@ -90,8 +104,10 @@ #usr/share/syslinux/com32/include/syslinux/features.h #usr/share/syslinux/com32/include/syslinux/idle.h #usr/share/syslinux/com32/include/syslinux/io.h +#usr/share/syslinux/com32/include/syslinux/keyboard.h #usr/share/syslinux/com32/include/syslinux/linux.h #usr/share/syslinux/com32/include/syslinux/loadfile.h +#usr/share/syslinux/com32/include/syslinux/memscan.h #usr/share/syslinux/com32/include/syslinux/movebits.h #usr/share/syslinux/com32/include/syslinux/pxe.h #usr/share/syslinux/com32/include/syslinux/reboot.h @@ -105,6 +121,7 @@ #usr/share/syslinux/com32/include/zconf.h #usr/share/syslinux/com32/include/zlib.h #usr/share/syslinux/com32/libcom32.a +#usr/share/syslinux/com32/libcom32gpl.a #usr/share/syslinux/com32/libutil_com.a #usr/share/syslinux/com32/libutil_lnx.a #usr/share/syslinux/config.c32 @@ -113,26 +130,39 @@ #usr/share/syslinux/dmitest.c32 #usr/share/syslinux/elf.c32 #usr/share/syslinux/ethersel.c32 +#usr/share/syslinux/gfxboot.com #usr/share/syslinux/gptmbr.bin +#usr/share/syslinux/gptmbr_c.bin +#usr/share/syslinux/gptmbr_f.bin #usr/share/syslinux/gpxelinux.0 +#usr/share/syslinux/hdt.c32 #usr/share/syslinux/ifcpu64.c32 +#usr/share/syslinux/isohdpfx.bin +#usr/share/syslinux/isohdpfx_c.bin +#usr/share/syslinux/isohdpfx_f.bin #usr/share/syslinux/isolinux-debug.bin #usr/share/syslinux/isolinux.bin +#usr/share/syslinux/kbdmap.c32 #usr/share/syslinux/linux.c32 #usr/share/syslinux/mboot.c32 #usr/share/syslinux/mbr.bin +#usr/share/syslinux/mbr_c.bin +#usr/share/syslinux/mbr_f.bin #usr/share/syslinux/memdisk #usr/share/syslinux/memdump.com #usr/share/syslinux/meminfo.c32 #usr/share/syslinux/menu.c32 #usr/share/syslinux/pcitest.c32 #usr/share/syslinux/pmload.c32 +#usr/share/syslinux/poweroff.com #usr/share/syslinux/pxechain.com #usr/share/syslinux/pxelinux.0 #usr/share/syslinux/reboot.c32 +#usr/share/syslinux/rosh.c32 #usr/share/syslinux/sanboot.c32 #usr/share/syslinux/sdi.c32 #usr/share/syslinux/syslinux.com #usr/share/syslinux/syslinux.exe #usr/share/syslinux/vesainfo.c32 #usr/share/syslinux/vesamenu.c32 +#usr/share/syslinux/vpdtest.c32 diff --git a/src/rootfiles/core/syslog-ng b/src/rootfiles/core/syslog-ng index dbd7b0227..0bcb78ea0 100644 --- a/src/rootfiles/core/syslog-ng +++ b/src/rootfiles/core/syslog-ng @@ -1,3 +1,4 @@ +etc/init.d/syslog-ng etc/syslog-ng etc/syslog-ng/syslog-ng.conf sbin/syslog-ng diff --git a/src/rootfiles/core/system-release b/src/rootfiles/core/system-release new file mode 100644 index 000000000..f2f933a45 --- /dev/null +++ b/src/rootfiles/core/system-release @@ -0,0 +1,3 @@ +etc/ipfire-release +etc/issue +etc/system-release diff --git a/src/rootfiles/core/sysvinit b/src/rootfiles/core/sysvinit index ec8eb628d..73876fcc7 100644 --- a/src/rootfiles/core/sysvinit +++ b/src/rootfiles/core/sysvinit @@ -1,5 +1,6 @@ bin/mountpoint bin/pidof +etc/inittab #sbin/bootlogd sbin/halt sbin/init