- merged TLDize patch

diff --git a/doc/net-scripts.txt b/doc/net-scripts.txt
index ccc52b08b281cc5b88508fbb584555971a76388b..256d660551fb4c1dc1697649003e2034f8be87f2 100644 (file)
--- a/doc/net-scripts.txt
+++ b/doc/net-scripts.txt
@@ -145,11 +145,11 @@ Files in /etc/sysconfig/interfaces/
     INITSCRIPT=<modem command>
       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>
       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 --git a/doc/sysvinitfiles b/doc/sysvinitfiles
index 24b0c607edb6d42d9318b8a25fcc741fd77a4d47..771a9489a8c6bc6a2854b90d090e4fd99f9ae15b 100644 (file)
--- a/doc/sysvinitfiles
+++ b/doc/sysvinitfiles
@@ -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/<servicename>

diff --git a/hwprofile b/hwprofile
index 4f24a9e6ad8cecaff8839bdeb6c76d4a5c68152a..10b7707afb15d2160f5b245a7a3b92ad796a0668 100755 (executable)
--- a/hwprofile
+++ b/hwprofile
@@ -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 --git a/inittab b/inittab
index d8b4c945705f2ed58fe05943bc4aee8c550d6143..9d00363e385f36425ff8e4564cfe9b0458fff41e 100644 (file)
--- a/inittab
+++ b/inittab
@@ -7,7 +7,7 @@
 #              Modified for RHS Linux by Marc Ewing and Donnie Barnes
 #
 
-# Default runlevel. The runlevels used by PLD Linux are:
+# Default runlevel. The runlevels used by TLD Linux are:
 #   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 --git a/lib/functions b/lib/functions
index bbdbd64cfea3a8716080d2b8fe44e16692f206d7..98de9cc751aab69f60b2deff4bc31f9620111ffb 100644 (file)
--- a/lib/functions
+++ b/lib/functions
@@ -5,7 +5,7 @@
 #
 # Author:      Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
 # Hacked by:   Greg Galloway and Marc Ewing
-# Modified for PLD Linux by:
+# Modified for TLD Linux by:
 #              Marek Obuchowicz <elephant@pld-linux.org>
 #              Arkadiusz Miśkiewicz <misiek@pld-linux.org>
 #              Michał Kochanowicz <mkochano@pld-linux.org>
@@ -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" 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
@@ -417,7 +417,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 time
 

diff --git a/po/de.po b/po/de.po
index 59fcaf519b5167a26742f3b5ecf2dfa4779a988c..b99014e98c5e54a8a31b58fb24a2ed20faa8ab6f 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -446,7 +446,7 @@ msgid " in cpuset %s..."
 msgstr ""
 
 #: .././rc.d/rc.sysinit:231
-msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s"
+msgid "\t\t\t%sPowered by %sTLD Linux%s"
 msgstr ""
 
 #: .././rc.d/init.d/netfs:154

diff --git a/po/pl.po b/po/pl.po
index 9c7dfa648a9fe5e124aabab6b0526c3b31bc77d5..4284e4a54d30945039fd2eacfb645df504b3cba2 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -443,8 +443,8 @@ msgid " in cpuset %s..."
 msgstr " w cpusecie %s..."
 
 #: .././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%s"
+msgstr "\t\t\t%sNapędzane przez %sTLD Linux%s"
 
 #: .././rc.d/init.d/netfs:154
 msgid "Active NFS mountpoints: "

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index f7f0eeae19ffc1dda0272ef78a1fc740fc683d07..121e48f91e7fe633369420d2603bd53978db8468 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -425,7 +425,7 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
 
        init_selinux
 
-       # PLD Linux LiveCD support
+       # TLD Linux LiveCD support
        if [ -x /etc/rc.d/rc.live ]; then
                /etc/rc.d/rc.live
        fi
@@ -456,7 +456,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%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 --git a/service b/service
index f882bdb2888fd1d2535ce383b87c03716f4c6ec6..9184a4f35d046f7d86e20b27e4d107126654a58a 100755 (executable)
--- a/service
+++ b/service
@@ -114,7 +114,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 --git a/src/setuidgid.c b/src/setuidgid.c
index 9c57cf659a928dbabc8d64c9bebc2250dd037de7..946e53a18dc55e0e426be500d18e886de4b5575e 100644 (file)
--- a/src/setuidgid.c
+++ b/src/setuidgid.c
@@ -47,7 +47,7 @@ void die2(const char *msg1, const char *msg2) {
        exit(1);
 }
 void show_version() {
-       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 --git a/sysconfig/init-colors b/sysconfig/init-colors
index 500e22e253c2e833e2ed4d8338a1b837d1fe910e..1632fdb43a6be2caeac7d35703636d5d7581396b 100644 (file)
--- a/sysconfig/init-colors
+++ b/sysconfig/init-colors
@@ -1,11 +1,11 @@
-# Default PLD Linux colors.
+# Default TLD Linux colors.
 
 CBRACKETS="$CYAN"      # brackets [ ] color
 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" 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 --git a/sysconfig/init-colors.gentoo b/sysconfig/init-colors.gentoo
index 8987a5b83d120e100f963ed8bf232f37146e7d1c..e9d331ebe622127ef519e89b06d590f97b30a785 100644 (file)
--- a/sysconfig/init-colors.gentoo
+++ b/sysconfig/init-colors.gentoo
@@ -5,7 +5,7 @@ CDONE="$GREEN $BOLD"            # DONE and WORK color
 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" 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 --git a/sysconfig/network b/sysconfig/network
index e71987a6da7022971a1f95b939f8e04baf27a160..d38b10579a4360bfd849c932af34d6bbf8aabc8d 100644 (file)
--- a/sysconfig/network
+++ b/sysconfig/network
@@ -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.