From 5dea51fd57518dcb10d2ce043aa09d080f6192d4 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Tue, 17 Sep 2013 13:05:45 +0200 Subject: [PATCH] Remove syslog-ng and msysklogd from various platforms; replaced by default by systemd journal --- platforms/livecd-gnome-root/Makefile | 2 +- platforms/livecd-gnome-root/post.inc.sh | 5 ----- platforms/livecd-light-root/Makefile | 2 +- platforms/livecd-light-root/post.inc.sh | 5 ----- platforms/livecd-root/Makefile | 2 +- platforms/livecd-root/post.inc.sh | 5 ----- platforms/livedvd-root/Makefile | 2 +- platforms/livedvd-root/post.inc.sh | 5 ----- platforms/livegames-root/Makefile | 2 +- platforms/livegames-root/post.inc.sh | 5 ----- platforms/rootfs-light/Makefile | 4 ++-- platforms/rootfs/Makefile | 2 +- platforms/testcd-root/Makefile | 2 +- platforms/testcd-root/post.inc.sh | 5 ----- 14 files changed, 9 insertions(+), 39 deletions(-) diff --git a/platforms/livecd-gnome-root/Makefile b/platforms/livecd-gnome-root/Makefile index 8b3f96a..c5f5357 100644 --- a/platforms/livecd-gnome-root/Makefile +++ b/platforms/livecd-gnome-root/Makefile @@ -18,7 +18,7 @@ $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-calc libreoffice-writer libre $(MAKEDIST_TARGET)-livecd-gnome-root: \ postplug-xorg postplug-sound \ - $(MAKEDIST_TARGET)-commontools msysklogd xorg-server \ + $(MAKEDIST_TARGET)-commontools xorg-server \ xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \ xorg-drv-input-synaptics xorg-apps-extra xterm \ ttf-freefont liberation-fonts-ttf \ diff --git a/platforms/livecd-gnome-root/post.inc.sh b/platforms/livecd-gnome-root/post.inc.sh index 9e5c69f..8dc7d38 100644 --- a/platforms/livecd-gnome-root/post.inc.sh +++ b/platforms/livecd-gnome-root/post.inc.sh @@ -31,11 +31,6 @@ chroot $MOUNTDIR gtk-update-icon-cache /usr/share/icons/hicolor # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri -# don't stop msysklogd before halt/shutdown -# -rm -f $MOUNTDIR/etc/rc0.d/K93msysklogd -rm -f $MOUNTDIR/etc/rc6.d/K93msysklogd - # set timezone according to LANGUAGE (default is UTC) # case $LANGUAGE in diff --git a/platforms/livecd-light-root/Makefile b/platforms/livecd-light-root/Makefile index c7666c4..1cd1313 100644 --- a/platforms/livecd-light-root/Makefile +++ b/platforms/livecd-light-root/Makefile @@ -13,7 +13,7 @@ $(MAKEDIST_TARGET)-livecd-light-libreoffice: libreoffice-calc libreoffice-writer $(MAKEDIST_TARGET)-livecd-light-root: \ postplug-xorg postplug-sound \ - $(MAKEDIST_TARGET)-commontools msysklogd xorg-server \ + $(MAKEDIST_TARGET)-commontools xorg-server \ xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \ xorg-drv-input-synaptics xorg-apps-extra xterm \ ttf-freefont liberation-fonts-ttf \ diff --git a/platforms/livecd-light-root/post.inc.sh b/platforms/livecd-light-root/post.inc.sh index 66be490..9b99b70 100644 --- a/platforms/livecd-light-root/post.inc.sh +++ b/platforms/livecd-light-root/post.inc.sh @@ -20,11 +20,6 @@ sed -i "s|# autologin.*|autologin=liveuser|" $MOUNTDIR/etc/lxdm/lxdm.conf # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri -# don't stop msysklogd before halt/shutdown -# -rm -f $MOUNTDIR/etc/rc0.d/K93msysklogd -rm -f $MOUNTDIR/etc/rc6.d/K93msysklogd - # set timezone according to LANGUAGE (default is UTC) # case $LANGUAGE in diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile index 238e872..7279071 100644 --- a/platforms/livecd-root/Makefile +++ b/platforms/livecd-root/Makefile @@ -5,7 +5,7 @@ $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libre $(MAKEDIST_TARGET)-livecd-root: \ postplug-xorg postplug-sound openssh-server \ - $(MAKEDIST_TARGET)-commontools msysklogd xorg-server \ + $(MAKEDIST_TARGET)-commontools xorg-server \ xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \ xorg-drv-input-synaptics xorg-apps-extra xterm \ ttf-freefont liberation-fonts-ttf \ diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh index 4446d65..2f3c70c 100644 --- a/platforms/livecd-root/post.inc.sh +++ b/platforms/livecd-root/post.inc.sh @@ -27,11 +27,6 @@ fi # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri -# don't stop msysklogd before halt/shutdown -# -rm -f $MOUNTDIR/etc/rc0.d/K93msysklogd -rm -f $MOUNTDIR/etc/rc6.d/K93msysklogd - # set timezone according to LANGUAGE (default is UTC) # case $LANGUAGE in diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile index 7723374..7771de0 100644 --- a/platforms/livedvd-root/Makefile +++ b/platforms/livedvd-root/Makefile @@ -5,7 +5,7 @@ $(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libr $(MAKEDIST_TARGET)-livedvd-root: \ postplug-xorg postplug-sound openssh-server \ - $(MAKEDIST_TARGET)-commontools msysklogd xorg-server \ + $(MAKEDIST_TARGET)-commontools xorg-server \ xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \ xorg-drv-input-synaptics xorg-apps-extra xterm \ ttf-freefont liberation-fonts-ttf \ diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index 7811dbe..258200e 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -27,11 +27,6 @@ fi # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri -# don't stop msysklogd before halt/shutdown -# -rm -f $MOUNTDIR/etc/rc0.d/K93msysklogd -rm -f $MOUNTDIR/etc/rc6.d/K93msysklogd - # set timezone according to LANGUAGE (default is UTC) # case $LANGUAGE in diff --git a/platforms/livegames-root/Makefile b/platforms/livegames-root/Makefile index 765befa..47969eb 100644 --- a/platforms/livegames-root/Makefile +++ b/platforms/livegames-root/Makefile @@ -10,7 +10,7 @@ $(MAKEDIST_TARGET)-livegames-kde4: kppp krfb ark kcalc kdf kfloppy kgpg desktop- $(MAKEDIST_TARGET)-livegames-root: \ postplug-xorg postplug-sound openssh-server \ - $(MAKEDIST_TARGET)-commontools msysklogd xorg-server \ + $(MAKEDIST_TARGET)-commontools xorg-server \ xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \ xorg-drv-input-synaptics \ ttf-freefont liberation-fonts-ttf \ diff --git a/platforms/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh index 631c908..ed23951 100644 --- a/platforms/livegames-root/post.inc.sh +++ b/platforms/livegames-root/post.inc.sh @@ -27,11 +27,6 @@ fi # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri -# don't stop msysklogd before halt/shutdown -# -rm -f $MOUNTDIR/etc/rc0.d/K93msysklogd -rm -f $MOUNTDIR/etc/rc6.d/K93msysklogd - # set timezone according to LANGUAGE (default is UTC) # case $LANGUAGE in diff --git a/platforms/rootfs-light/Makefile b/platforms/rootfs-light/Makefile index 6f8d167..10838cd 100644 --- a/platforms/rootfs-light/Makefile +++ b/platforms/rootfs-light/Makefile @@ -15,11 +15,11 @@ $(MAKEDIST_TARGET)-$(PLATFORM): \ parted iputils file rootfiles ppp minicom xinetd chrony locales mc \ man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ - openmamba-devel timezone sudo syslog-ng kmod \ + openmamba-devel timezone sudo kmod \ liblame expect prelink NetworkManager ModemManager procps \ xorg-server x11vnc xkeyboard-config \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ - dhcp-server rfkill plymouth livecd-tools rdesktop mingetty \ + dhcp-server rfkill plymouth livecd-tools rdesktop \ postplug-xorg postplug-sound gparted tar net-tools chrony mambatray florence # startactive diff --git a/platforms/rootfs/Makefile b/platforms/rootfs/Makefile index 6e1db9f..a691693 100644 --- a/platforms/rootfs/Makefile +++ b/platforms/rootfs/Makefile @@ -19,7 +19,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): \ parted iputils file rootfiles ppp minicom xinetd chrony locales mc \ man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ - openmamba-devel timezone sudo syslog-ng kmod \ + openmamba-devel timezone sudo kmod \ liblame expect prelink NetworkManager ModemManager procps \ xorg-server x11vnc xkeyboard-config screen \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ diff --git a/platforms/testcd-root/Makefile b/platforms/testcd-root/Makefile index 4b3af7e..50b970e 100644 --- a/platforms/testcd-root/Makefile +++ b/platforms/testcd-root/Makefile @@ -5,7 +5,7 @@ $(MAKEDIST_TARGET)-testcd-libreoffice: libreoffice-calc libreoffice-writer libre $(MAKEDIST_TARGET)-testcd-root: \ postplug-xorg postplug-sound \ - $(MAKEDIST_TARGET)-commontools msysklogd xorg-server \ + $(MAKEDIST_TARGET)-commontools xorg-server \ xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \ xorg-drv-input-synaptics xorg-apps-extra xterm \ ttf-freefont liberation-fonts-ttf \ diff --git a/platforms/testcd-root/post.inc.sh b/platforms/testcd-root/post.inc.sh index 6cdd366..98d9dfd 100644 --- a/platforms/testcd-root/post.inc.sh +++ b/platforms/testcd-root/post.inc.sh @@ -27,11 +27,6 @@ fi # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri -# don't stop msysklogd before halt/shutdown -# -rm -f $MOUNTDIR/etc/rc0.d/K93msysklogd -rm -f $MOUNTDIR/etc/rc6.d/K93msysklogd - # set timezone according to LANGUAGE (default is UTC) # case $LANGUAGE in