Replace syslog-ng with rsyslog

diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index ce5ffe7..038c4a9 100644 (file)
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -37,8 +37,8 @@ openssh-server
 pciutils
 resolvconf
 rsync
 pciutils
 resolvconf
 rsync

+rsyslog

 strace
 strace

-syslog-ng

 usbutils
 wireless-tools
 wpasupplicant
 usbutils
 wireless-tools
 wpasupplicant

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index cc4416e..68b5fe1 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -117,14 +117,12 @@ ptfinder
 rainbowcrack
 rootsh
 salvage-ntfs
 rainbowcrack
 rootsh
 salvage-ntfs

-scrounge-ntfs

 shadowfs
 shish
 shmux
 sitar
 smap
 speechd-up
 shadowfs
 shish
 shmux
 sitar
 smap
 speechd-up

-ssdeep

 sudosh
 svn-ssh-wrappers
 tal
 sudosh
 svn-ssh-wrappers
 tal


@@ -148,7 +146,7 @@ zsh-lovers
 # glipper-nognome grml-ddcxinfo grml-reportbug grml-robocup-files grml-samsung-x20
 # histring hydra i855crt icmp-mtu icmp-quench icmp-reset lame lame-extras libewf
 # magicrescue multiseat ncp prosilla pspax ptfinder quadkonsole rootsh
 # glipper-nognome grml-ddcxinfo grml-reportbug grml-robocup-files grml-samsung-x20
 # histring hydra i855crt icmp-mtu icmp-quench icmp-reset lame lame-extras libewf
 # magicrescue multiseat ncp prosilla pspax ptfinder quadkonsole rootsh

-# salvage-ntfs scrounge-ntfs shadowfs shish shmux speechd-up squashfs ssdeep
+# salvage-ntfs shadowfs shish shmux speechd-up squashfs

 # sudosh tal thc-pptp-bruter tlswrap tpm-tools trapdoor2 trousers yersinia
 ## }}}
 
 # sudosh tal thc-pptp-bruter tlswrap tpm-tools trapdoor2 trousers yersinia
 ## }}}
 


@@ -1538,6 +1536,7 @@ scponly
 screen
 screenie
 scrot
 screen
 screenie
 scrot

+scrounge-ntfs

 scsiadd
 scsi-idle
 scsitools
 scsiadd
 scsi-idle
 scsitools


@@ -1624,6 +1623,7 @@ squid-common
 squidview
 src2tex
 srcinst
 squidview
 src2tex
 srcinst

+ssdeep

 ssed
 ssh
 ssh-askpass
 ssed
 ssh
 ssh-askpass


@@ -1661,7 +1661,6 @@ synergy
 syrep
 sysfsutils
 syslinux
 syrep
 sysfsutils
 syslinux

-syslog-ng

 sysprof
 sysstat
 systune
 sysprof
 sysstat
 systune

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 3ecf6fb..dce2d99 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -190,7 +190,6 @@ strace
 sudo
 symlinks
 syslinux
 sudo
 symlinks
 syslinux

-syslog-ng

 sysvinit
 sysvinit-utils
 tar
 sysvinit
 sysvinit-utils
 tar

diff --git a/etc/grml/fai/config/package_config/GRML_POWERPC b/etc/grml/fai/config/package_config/GRML_POWERPC
index d20f5ae..ffe9e1e 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_POWERPC
+++ b/etc/grml/fai/config/package_config/GRML_POWERPC
@@ -1,4 +1,5 @@
 PACKAGES aptitude POWERPC
 PACKAGES aptitude POWERPC

-insert_your_powerpc_only_packages_here
-and_here_and_use_class_POWERPC_then_:)

 
 

+# TODO
+# insert_your_powerpc_only_packages_here
+# and_here_and_use_class_POWERPC_then_:)

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 63a5ca1..7ee85d7 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -159,7 +159,6 @@ strace
 sudo
 symlinks
 syslinux
 sudo
 symlinks
 syslinux

-syslog-ng

 sysvinit
 sysvinit-utils
 tar
 sysvinit
 sysvinit-utils
 tar