X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=blobdiff_plain;f=rc-scripts-tld.patch;h=1f30c9ed2eaceaecf495409a6a24ef2d3f7b5afc;hp=d2b4f90b0e9dc63fb9bb2f0e52b9b7a6e5f6bb28;hb=e2bf0309756b52584fc99abe1e1d032368eb5611;hpb=068040a7ccb6f9951b77f4541af278f87f6c9e45 diff --git a/rc-scripts-tld.patch b/rc-scripts-tld.patch index d2b4f90..1f30c9e 100644 --- a/rc-scripts-tld.patch +++ b/rc-scripts-tld.patch @@ -1,7 +1,55 @@ -diff -urN rc-scripts-0.4.5.1.pld//inittab rc-scripts-0.4.5.1/inittab ---- rc-scripts-0.4.5.1.pld//inittab 2012-04-01 19:46:54.662913738 +0000 -+++ rc-scripts-0.4.5.1/inittab 2011-10-03 20:39:36.000000000 +0000 -@@ -8,7 +8,7 @@ +diff -urNp rc-scripts-0.4.13.orig/doc/net-scripts.txt rc-scripts-0.4.13/doc/net-scripts.txt +--- rc-scripts-0.4.13.orig/doc/net-scripts.txt 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/doc/net-scripts.txt 2015-02-06 13:30:49.145314244 +0000 +@@ -145,11 +145,11 @@ Files in /etc/sysconfig/interfaces/ + INITSCRIPT= + string which initialises your modem. Usualy something like + AT&F0&C1&D2 +- (PLD Linux rc-scripts specific option) ++ (TLD Linux rc-scripts specific option) + DATAFORCHAT= + List of variables which should be exported to chat script. + Used mostly for passing USERNAME and PASSWORD into it. (see below) +- (PLD Linux rc-scripts specific option) ++ (TLD Linux rc-scripts specific option) + PEERDNS=yes|no + IPV6_PPP=yes|no + use IPv6 for ppp +@@ -186,7 +186,7 @@ Files in /etc/sysconfig/interfaces/ + the connection. For SLIP devices, a DIP script is written + from the chat script; for PPP devices, the chat script is used + directly. +- In PLD Linux version of rc-scripts, this file is parsed by shell ++ In TLD Linux version of rc-scripts, this file is parsed by shell + (actually by grep in firstplace to get rid of comments) before it + is passed to chat. + This allows you to substitute shell variables with their values +diff -urNp rc-scripts-0.4.13.orig/doc/sysvinitfiles rc-scripts-0.4.13/doc/sysvinitfiles +--- rc-scripts-0.4.13.orig/doc/sysvinitfiles 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/doc/sysvinitfiles 2015-02-06 13:30:49.145314244 +0000 +@@ -1,4 +1,4 @@ +-Writing System V init scripts for PLD Linux ++Writing System V init scripts for TLD Linux + =============================================== + + All System V init scripts are named /etc/rc.d/init.d/ +diff -urNp rc-scripts-0.4.13.orig/hwprofile rc-scripts-0.4.13/hwprofile +--- rc-scripts-0.4.13.orig/hwprofile 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/hwprofile 2015-02-06 13:36:28.437314244 +0000 +@@ -42,9 +42,6 @@ no opts - show help + -f - find proper profile and run it + -l - list configured profiles + -q - be quiet (used only in few modes) +- +-Please send all bug reports to: +-pld-rc-scripts@pld-linux.org. + ' + } + +diff -urNp rc-scripts-0.4.13.orig/inittab rc-scripts-0.4.13/inittab +--- rc-scripts-0.4.13.orig/inittab 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/inittab 2015-02-06 13:30:49.146314244 +0000 +@@ -7,7 +7,7 @@ # Modified for RHS Linux by Marc Ewing and Donnie Barnes # @@ -10,101 +58,122 @@ diff -urN rc-scripts-0.4.5.1.pld//inittab rc-scripts-0.4.5.1/inittab # 0 - halt (Do NOT set initdefault to this) # 1 - Single user mode # 2 - Multiuser, without NFS (The same as 3, if you do not have networking) -diff -urN rc-scripts-0.4.5.1.pld//lib/functions rc-scripts-0.4.5.1/lib/functions ---- rc-scripts-0.4.5.1.pld//lib/functions 2012-04-01 19:46:54.331047818 +0000 -+++ rc-scripts-0.4.5.1/lib/functions 2011-10-03 20:39:36.000000000 +0000 -@@ -48,7 +48,7 @@ +diff -urNp rc-scripts-0.4.13.orig/lib/functions rc-scripts-0.4.13/lib/functions +--- rc-scripts-0.4.13.orig/lib/functions 2015-01-22 16:01:15.000000000 +0000 ++++ rc-scripts-0.4.13/lib/functions 2015-02-06 13:30:49.147314244 +0000 +@@ -5,7 +5,7 @@ + # + # Author: Miquel van Smoorenburg, + # Hacked by: Greg Galloway and Marc Ewing +-# Modified for PLD Linux by: ++# Modified for TLD Linux by: + # Marek Obuchowicz + # Arkadiusz Miśkiewicz + # Michał Kochanowicz +@@ -47,7 +47,7 @@ CDONE="$GREEN" # DONE and WORK color CBUSY="$MAGENTA" # BUSY color CFAIL="$RED" # FAIL and DIED color CPOWEREDBY="$CYAN" # "Powered by" color -CPLD="$GREEN" # "PLD Linux Distribution" color -+CTLD="$GREEN" # "TLD Linux Distribution" color ++CTLD="$GREEN" # "TLD Linux" color CI="$RED" # Capital I color (press I to enter interactive startup) CRESMAN="$GREEN" # "Resource Manager" color CHARS="" # Characters displayed on the beginning of show line -@@ -379,7 +379,7 @@ +@@ -422,7 +422,7 @@ msg_usage() { nls "Usage: %s" "$*" } -# Some functions to handle PLD Linux-style messages +# Some functions to handle TLD Linux-style messages show() { - local text len + local text len time -diff -urN rc-scripts-0.4.5.1.pld//po/de.po rc-scripts-0.4.5.1/po/de.po ---- rc-scripts-0.4.5.1.pld//po/de.po 2012-04-01 19:46:54.405047851 +0000 -+++ rc-scripts-0.4.5.1/po/de.po 2011-10-03 20:39:36.000000000 +0000 -@@ -452,7 +452,7 @@ +diff -urNp rc-scripts-0.4.13.orig/po/de.po rc-scripts-0.4.13/po/de.po +--- rc-scripts-0.4.13.orig/po/de.po 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/po/de.po 2015-02-06 13:30:49.147314244 +0000 +@@ -446,7 +446,7 @@ msgid " in cpuset %s..." msgstr "" - #: .././rc.d/rc.sysinit:227 + #: .././rc.d/rc.sysinit:231 -msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s" -+msgid "\t\t\t%sPowered by %sTLD Linux Distribution%s" ++msgid "\t\t\t%sPowered by %sTLD Linux%s" msgstr "" #: .././rc.d/init.d/netfs:154 -diff -urN rc-scripts-0.4.5.1.pld//po/pl.po rc-scripts-0.4.5.1/po/pl.po ---- rc-scripts-0.4.5.1.pld//po/pl.po 2012-04-01 19:46:54.406047776 +0000 -+++ rc-scripts-0.4.5.1/po/pl.po 2011-10-03 20:39:36.000000000 +0000 -@@ -449,8 +449,8 @@ +diff -urNp rc-scripts-0.4.13.orig/po/pl.po rc-scripts-0.4.13/po/pl.po +--- rc-scripts-0.4.13.orig/po/pl.po 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/po/pl.po 2015-02-06 13:30:49.147314244 +0000 +@@ -443,8 +443,8 @@ msgid " in cpuset %s..." msgstr " w cpusecie %s..." - #: .././rc.d/rc.sysinit:227 + #: .././rc.d/rc.sysinit:231 -msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s" -msgstr "\t\t\t%sNapędzane przez %sPLD Linux Distribution%s" -+msgid "\t\t\t%sPowered by %sTLD Linux Distribution%s" -+msgstr "\t\t\t%sNapędzane przez %sTLD Linux Distribution%s" ++msgid "\t\t\t%sPowered by %sTLD Linux%s" ++msgstr "\t\t\t%sNapędzane przez %sTLD Linux%s" #: .././rc.d/init.d/netfs:154 msgid "Active NFS mountpoints: " -diff -urN rc-scripts-0.4.5.1.pld//po/rc-scripts.pot rc-scripts-0.4.5.1/po/rc-scripts.pot ---- rc-scripts-0.4.5.1.pld//po/rc-scripts.pot 2012-04-01 19:46:54.407047712 +0000 -+++ rc-scripts-0.4.5.1/po/rc-scripts.pot 2011-10-03 20:39:36.000000000 +0000 -@@ -455,7 +455,7 @@ +diff -urNp rc-scripts-0.4.13.orig/po/rc-scripts.pot rc-scripts-0.4.13/po/rc-scripts.pot +--- rc-scripts-0.4.13.orig/po/rc-scripts.pot 2015-01-22 16:03:03.000000000 +0000 ++++ rc-scripts-0.4.13/po/rc-scripts.pot 2015-02-06 13:30:49.148314244 +0000 +@@ -76,7 +76,7 @@ msgid "%s for %s exiting" msgstr "" - #: .././rc.d/rc.sysinit:239 + #: .././rc.d/rc.sysinit:462 -msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s" -+msgid "\t\t\t%sPowered by %sTLD Linux Distribution%s" ++msgid "\t\t\t%sPowered by %sTLD Linux%s" msgstr "" - #: .././rc.d/init.d/netfs:154 -diff -urN rc-scripts-0.4.5.1.pld//rc.d/rc.sysinit rc-scripts-0.4.5.1/rc.d/rc.sysinit ---- rc-scripts-0.4.5.1.pld//rc.d/rc.sysinit 2012-04-01 19:46:54.442048015 +0000 -+++ rc-scripts-0.4.5.1/rc.d/rc.sysinit 2011-10-03 20:39:36.000000000 +0000 -@@ -186,7 +186,7 @@ - mount -n -o gid=17 -t selinuxfs selinuxfs /selinux - fi + #: .././rc.d/init.d/netfs:138 +diff -urNp rc-scripts-0.4.13.orig/rc.d/rc.sysinit rc-scripts-0.4.13/rc.d/rc.sysinit +--- rc-scripts-0.4.13.orig/rc.d/rc.sysinit 2015-01-22 16:01:18.000000000 +0000 ++++ rc-scripts-0.4.13/rc.d/rc.sysinit 2015-02-06 13:30:49.149314244 +0000 +@@ -429,7 +429,7 @@ if ! is_yes "$VSERVER" && [[ "$container + + init_selinux - # PLD Linux LiveCD support + # TLD Linux LiveCD support if [ -x /etc/rc.d/rc.live ]; then /etc/rc.d/rc.live fi -@@ -229,7 +229,7 @@ +@@ -460,7 +460,7 @@ fi # Print welcome message -nls "\t\t\t%sPowered by %sPLD Linux Distribution%s" "$(termput setaf $CPOWEREDBY)" "$(termput setaf $CPLD)" "$(termput op)" -+nls "\t\t\t%sPowered by %sTLD Linux Distribution%s" "$(termput setaf $CPOWEREDBY)" "$(termput setaf $CTLD)" "$(termput op)" ++nls "\t\t\t%sPowered by %sTLD Linux%s" "$(termput setaf $CPOWEREDBY)" "$(termput setaf $CTLD)" "$(termput op)" if ! is_no "$RC_PROMPT"; then nls -n "\t\t Press %sI%s to enter interactive startup" "$(termput setaf $CI)" "$(termput op)" echo -diff -urN rc-scripts-0.4.5.1.pld//src/setuidgid.c rc-scripts-0.4.5.1/src/setuidgid.c ---- rc-scripts-0.4.5.1.pld//src/setuidgid.c 2012-04-01 19:46:54.204907409 +0000 -+++ rc-scripts-0.4.5.1/src/setuidgid.c 2011-10-03 20:39:36.000000000 +0000 -@@ -47,7 +47,7 @@ +diff -urNp rc-scripts-0.4.13.orig/service rc-scripts-0.4.13/service +--- rc-scripts-0.4.13.orig/service 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/service 2015-02-06 13:32:51.048314244 +0000 +@@ -123,7 +123,7 @@ status_all() { + done + } + +-VERSION="$(basename $0) ver. 0.91-pld" ++VERSION="$(basename $0) ver. 1.0-tld" + USAGE="Usage: $(basename $0) < option > | --status-all | \ + [ service_name [ command | --full-restart ] ]" + +diff -urNp rc-scripts-0.4.13.orig/src/setuidgid.c rc-scripts-0.4.13/src/setuidgid.c +--- rc-scripts-0.4.13.orig/src/setuidgid.c 2013-11-02 20:50:20.000000000 +0000 ++++ rc-scripts-0.4.13/src/setuidgid.c 2015-02-06 13:30:49.149314244 +0000 +@@ -47,7 +47,7 @@ void die2(const char *msg1, const char * exit(1); } void show_version() { -- fprintf(stderr, "%s $Rev: 12308 $ (PLD Linux rc-scripts)\n", progname); -+ fprintf(stderr, "%s $Rev: 12308 $ (TLD Linux rc-scripts)\n", progname); +- fprintf(stderr, "%s $Rev$ (PLD Linux rc-scripts)\n", progname); ++ fprintf(stderr, "%s $Rev$ (TLD Linux rc-scripts)\n", progname); } void version() { show_version(); -diff -urN rc-scripts-0.4.5.1.pld//sysconfig/init-colors rc-scripts-0.4.5.1/sysconfig/init-colors ---- rc-scripts-0.4.5.1.pld//sysconfig/init-colors 2012-04-01 19:46:54.649047787 +0000 -+++ rc-scripts-0.4.5.1/sysconfig/init-colors 2011-10-03 20:39:36.000000000 +0000 +diff -urNp rc-scripts-0.4.13.orig/sysconfig/init-colors rc-scripts-0.4.13/sysconfig/init-colors +--- rc-scripts-0.4.13.orig/sysconfig/init-colors 2013-11-02 20:50:20.000000000 +0000 ++++ rc-scripts-0.4.13/sysconfig/init-colors 2015-02-06 13:30:49.149314244 +0000 @@ -1,11 +1,11 @@ -# Default PLD Linux colors. +# Default TLD Linux colors. @@ -115,19 +184,31 @@ diff -urN rc-scripts-0.4.5.1.pld//sysconfig/init-colors rc-scripts-0.4.5.1/sysco CFAIL="$RED" # FAIL and DIED color CPOWEREDBY="$CYAN" # "Powered by" color -CPLD="$GREEN" # "PLD Linux Distribution" color -+CTLD="$GREEN" # "TLD Linux Distribution" color ++CTLD="$GREEN" # "TLD Linux" color CI="$RED" # Capital I color (press I to enter interactive startup) CRESMAN="$GREEN" # "Resource Manager" color CHARS="" # Characters displayed on the beginning of show line -diff -urN rc-scripts-0.4.5.1.pld//sysconfig/init-colors.gentoo rc-scripts-0.4.5.1/sysconfig/init-colors.gentoo ---- rc-scripts-0.4.5.1.pld//sysconfig/init-colors.gentoo 2012-04-01 19:46:54.654925316 +0000 -+++ rc-scripts-0.4.5.1/sysconfig/init-colors.gentoo 2011-10-03 20:39:36.000000000 +0000 -@@ -5,7 +5,7 @@ +diff -urNp rc-scripts-0.4.13.orig/sysconfig/init-colors.gentoo rc-scripts-0.4.13/sysconfig/init-colors.gentoo +--- rc-scripts-0.4.13.orig/sysconfig/init-colors.gentoo 2013-11-02 20:50:20.000000000 +0000 ++++ rc-scripts-0.4.13/sysconfig/init-colors.gentoo 2015-02-06 13:30:49.149314244 +0000 +@@ -5,7 +5,7 @@ CDONE="$GREEN $BOLD" # DONE and WORK co CBUSY="$MAGENTA $BOLD" # BUSY color CFAIL="$RED $BOLD" # FAIL and DIED color CPOWEREDBY="$BLUE $BOLD" # "Powered by" color -CPLD="$GREEN $BOLD" # "PLD Linux Distribution" color -+CTLD="$GREEN $BOLD" # "TLD Linux Distribution" color ++CTLD="$GREEN $BOLD" # "TLD Linux" color CI="$RED $BOLD" # Capital I color (press I to enter interactive startup) CRESMAN="$GREEN $BOLD" # "Resource Manager" color CHARS=" * " # Characters displayed on the beginning of show line +diff -urNp rc-scripts-0.4.13.orig/sysconfig/network rc-scripts-0.4.13/sysconfig/network +--- rc-scripts-0.4.13.orig/sysconfig/network 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/sysconfig/network 2015-02-06 13:30:49.151314244 +0000 +@@ -11,7 +11,7 @@ IPV4_NETWORKING=yes + # then set it in /etc/sysctl.conf + + # Set hostname here +-HOSTNAME=pldmachine ++HOSTNAME=tldlinux + + # Allow udev to create /etc/sysconfig/interfaces/ifcfg-* automatically? + # See /lib/udev/net_helper for details.