Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=d1cb8f3310234dcb4a66e7f2a060fbe15f74ce65
commit d1cb8f3310234dcb4a66e7f2a060fbe15f74ce65 Author: Miklos Vajna <vmik...@frugalware.org> Date: Mon Oct 31 12:45:59 2011 +0100 drop rc.S.diff, rc.S is replaced by systemd diff --git a/Makefile b/Makefile index 49f859d..996ccd6 100644 --- a/Makefile +++ b/Makefile @@ -19,14 +19,14 @@ SETUPINITRDSIZE = echo "$$(($$(gzip --list $(SETUPINITRD) |grep initrd-$(ARCH).i endif # needed files (files that we can't live without) NEED_FILES = fstab-update parse_cmdline.in xorg.conf.in rc.fsupd \ - crypt.c rc.fwlive rc.config configsave fileswap reboot.diff services.diff rc.S.diff \ + crypt.c rc.fwlive rc.config configsave fileswap reboot.diff services.diff \ rc.parse_cmdline parse_cmdline xstart xorg.conf menu.lst fwliverc INST_FILES_755 = /etc/rc.d/rc.fwlive /etc/rc.d/rc.config /etc/rc.d/rc.fsupd /usr/local/bin/configsave \ /usr/local/bin/fileswap /usr/local/bin/fstab-update /usr/local/bin/xstart /usr/local/bin/fwliverc \ /usr/local/bin/parse_cmdline /etc/rc.d/rc.parse_cmdline /tmp/live-base/tools/fpm2lzm INST_FILES_644 = /etc/X11/xorg.conf /boot/grub/menu.lst PWD = $(shell pwd) -PATCH_FILES = reboot.diff services.diff rc.S.diff +PATCH_FILES = reboot.diff services.diff REMOVE_FILES = /etc/rc.d/rcS.d/S{19rc.bootclean,07rc.frugalware} \ /etc/rc.d/rc{3.d,4.d}/S{21rc.firewall,26rc.lmsensors,32rc.sshd,78rc.mysqld,80rc.postfix,81rc.courier-authlib,82rc.imapd,82rc.pop3d,85rc.httpd,95rc.crond,99rc.cups,99rc.mono,99cups,12rc.syslog,13rc.portmap,19rc.rmount,50rc.atd} \ /etc/rc.d/rc0.d/K{00cups,01rc.cups,05rc.crond,60rc.atd,87rc.portmap,88rc.syslog,90rc.rmount,96rc.swap,98rc.interfaces,56rc.sshd,30rc.postfix} \ diff --git a/rc.S.diff b/rc.S.diff deleted file mode 100644 index e5147e9..0000000 --- a/rc.S.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- etc/rc.d/rc.S.orig 2007-05-06 12:56:41.000000000 +0200 -+++ etc/rc.d/rc.S 2007-05-06 12:57:53.000000000 +0200 -@@ -7,4 +7,9 @@ - export PATH=/sbin:/usr/sbin:/bin:/usr/bin - . /etc/profile.d/lang.sh - -+mount /proc && lang=`grep lang /proc/cmdline|sed 's/.*lang=\([^ ]*\)\( .*\|$\)/\1/'` -+if [ -n "$lang" ]; then -+ export LANG=$lang LC_ALL=$lang -+fi -+ - /etc/rc.d/rc.sysvinit 0 30 S _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git