Merge branch 'master' into openswan26

This commit is contained in:
Arne Fitzenreiter
2008-10-09 10:14:14 +02:00
10 changed files with 171 additions and 22 deletions

View File

@@ -8,7 +8,7 @@ DEVICE4 /var FSTYPE defaults 1 1
proc /proc proc defaults 0 0
sysfs /sys sysfs defaults 0 0
devpts /dev/pts devpts gid=4,mode=620 0 0
none /tmp tmpfs defaults,size=128M 0 0
#none /tmp tmpfs defaults 0 0
none /var/log/rrd tmpfs defaults,size=64M 0 0
none /var/lock tmpfs defaults,size=16M 0 0
none /var/run tmpfs defaults,size=16M 0 0

View File

@@ -0,0 +1,63 @@
usr/local/bin/7z
usr/local/lib/p7zip
#usr/local/lib/p7zip/7z
#usr/local/lib/p7zip/7z.so
#usr/local/lib/p7zip/Codecs
#usr/local/lib/p7zip/Codecs/Rar29.so
#usr/local/man/man1/7z.1
#usr/local/man/man1/7za.1
#usr/local/man/man1/7zr.1
#usr/local/share/doc/p7zip
#usr/local/share/doc/p7zip/ChangeLog
#usr/local/share/doc/p7zip/DOCS
#usr/local/share/doc/p7zip/DOCS/7zC.txt
#usr/local/share/doc/p7zip/DOCS/7zFormat.txt
#usr/local/share/doc/p7zip/DOCS/License.txt
#usr/local/share/doc/p7zip/DOCS/MANUAL
#usr/local/share/doc/p7zip/DOCS/MANUAL/commands
#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/add.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/bench.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/delete.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/extract.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/extract_full.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/index.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/list.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/style.css
#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/test.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/update.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/exit_codes.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/index.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/style.css
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_exclude.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_include.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_no.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/charset.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/exclude.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/include.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/index.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/list_tech.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/method.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/output_dir.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/overwrite.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/password.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/recurse.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/sfx.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ssc.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stdin.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stdout.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stop_switch.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/style.css
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/type.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/update.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/volume.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/working_dir.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/yes.htm
#usr/local/share/doc/p7zip/DOCS/MANUAL/syntax.htm
#usr/local/share/doc/p7zip/DOCS/Methods.txt
#usr/local/share/doc/p7zip/DOCS/copying.txt
#usr/local/share/doc/p7zip/DOCS/history.txt
#usr/local/share/doc/p7zip/DOCS/lzma.txt
#usr/local/share/doc/p7zip/DOCS/readme.txt
#usr/local/share/doc/p7zip/DOCS/unRarLicense.txt
#usr/local/share/doc/p7zip/README

View File

@@ -23,6 +23,7 @@ etc/udev/rules.d/55-scsi-cdrom.rules
etc/linuxigd/gatedesc.xml
usr/local/bin/getiptstate
usr/local/bin/makegraphs
usr/local/bin/hddshutdown
usr/local/bin/squidctrl
usr/local/bin/setddns.pl
srv/web/ipfire/cgi-bin/backup.cgi

View File

@@ -161,7 +161,7 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
# Update fstab
#
grep -v "tmpfs" /etc/fstab > /tmp/fstab.tmp
echo "none /tmp tmpfs defaults,size=128M 0 0" >> /tmp/fstab.tmp
echo "#none /tmp tmpfs defaults 0 0" >> /tmp/fstab.tmp
echo "none /var/log/rrd tmpfs defaults,size=64M 0 0" >> /tmp/fstab.tmp
echo "none /var/lock tmpfs defaults,size=16M 0 0" >> /tmp/fstab.tmp
echo "none /var/run tmpfs defaults,size=16M 0 0" >> /tmp/fstab.tmp