slugos: Major rename of common SlugOS files and directories from openslug to slugos.

64 files changed, 36 insertions, 44 deletions

diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 36c48e219e..efafe698dd 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -148,7 +148,6 @@ ${PKGDIR}/packages/openldap/*.bb \
 ${PKGDIR}/packages/openntpd/*.bb \
 ${PKGDIR}/packages/openobex-apps/*.bb \
 ${PKGDIR}/packages/openobex/*.bb \
-${PKGDIR}/packages/openslug-init/*.bb \
 ${PKGDIR}/packages/opensp/*.bb \
 ${PKGDIR}/packages/openssh/*.bb \
 ${PKGDIR}/packages/openssl/*.bb \
@@ -185,6 +184,7 @@ ${PKGDIR}/packages/sed/*.bb \
 ${PKGDIR}/packages/setpwc/*.bb \
 ${PKGDIR}/packages/sgml-common/*.bb \
 ${PKGDIR}/packages/slugimage/*.bb \
+${PKGDIR}/packages/slugos-init/*.bb \
 ${PKGDIR}/packages/ssmtp/*.bb \
 ${PKGDIR}/packages/strace/*.bb \
 ${PKGDIR}/packages/streamripper/*.bb \
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 6ebec413c5..21f1ae5bb9 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -21,9 +21,8 @@
 #
 # The following names are deprecated:
 #
-# openslug - the historical name of a canonical nslu2-bag distro,
-#            used generically for NSLU2 specific distro features and
-#            the default OVERRIDE for all these NSLU2 builds
+# openslug - the historical name of a canonical nslu2-bag distro
+#            also the name of a standard nslu2-bag distro with a package feed
 # ucslugc  - the historical (and obsolete) name of nslu2-btu
 #            also the name of a standard nslu2-btu distro with a package feed
 #
@@ -62,10 +61,7 @@ USE_NLS_glib-2.0 = "yes"
 
 INHERIT += "package_ipk debian"
 
-# The value of DISTRO_BASE is set to 'openslug' to pick up the original openslug
-# overrides, slugos is the preferred override!
-#FIXME: remove openslug
-DISTRO_BASE = ":slugos:openslug"
+DISTRO_BASE = ":slugos"
 
 # packages/meta/slugos-image.bb generates a binary image of the root file system
 # with a name controlled by the following setting - it defaults to the top level
diff --git a/packages/base-files/base-files/openslug/.mtn2git_empty b/packages/base-files/base-files/slugos/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/base-files/base-files/openslug/.mtn2git_empty
+++ b/packages/base-files/base-files/slugos/.mtn2git_empty
diff --git a/packages/base-files/base-files/openslug/fstab b/packages/base-files/base-files/slugos/fstab
index 0ac6b1460c..0ac6b1460c 100644
--- a/packages/base-files/base-files/openslug/fstab
+++ b/packages/base-files/base-files/slugos/fstab
diff --git a/packages/base-passwd/base-passwd-3.5.9/openslug/.mtn2git_empty b/packages/base-passwd/base-passwd-3.5.9/slugos/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/base-passwd/base-passwd-3.5.9/openslug/.mtn2git_empty
+++ b/packages/base-passwd/base-passwd-3.5.9/slugos/.mtn2git_empty
diff --git a/packages/base-passwd/base-passwd-3.5.9/openslug/README b/packages/base-passwd/base-passwd-3.5.9/slugos/README
index 05c2e419f5..05c2e419f5 100644
--- a/packages/base-passwd/base-passwd-3.5.9/openslug/README
+++ b/packages/base-passwd/base-passwd-3.5.9/slugos/README
diff --git a/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch
index 97dab68f33..97dab68f33 100644
--- a/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
+++ b/packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch
diff --git a/packages/bluez/files/openslug/.mtn2git_empty b/packages/bluez/files/slugos/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/bluez/files/openslug/.mtn2git_empty
+++ b/packages/bluez/files/slugos/.mtn2git_empty
diff --git a/packages/bluez/files/openslug/bluetooth.default b/packages/bluez/files/slugos/bluetooth.default
index 10f628e314..10f628e314 100644
--- a/packages/bluez/files/openslug/bluetooth.default
+++ b/packages/bluez/files/slugos/bluetooth.default
diff --git a/packages/bluez/files/openslug/hcid.conf b/packages/bluez/files/slugos/hcid.conf
index 46a5d5fd54..46a5d5fd54 100644
--- a/packages/bluez/files/openslug/hcid.conf
+++ b/packages/bluez/files/slugos/hcid.conf
diff --git a/packages/busybox/busybox-1.00/openslug/.mtn2git_empty b/packages/busybox/busybox-1.00/slugos/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/busybox/busybox-1.00/openslug/.mtn2git_empty
+++ b/packages/busybox/busybox-1.00/slugos/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.00/openslug/defconfig b/packages/busybox/busybox-1.00/slugos/defconfig
index 7debaeced2..7debaeced2 100644
--- a/packages/busybox/busybox-1.00/openslug/defconfig
+++ b/packages/busybox/busybox-1.00/slugos/defconfig
diff --git a/packages/busybox/busybox-1.00/openslug/udhcpscript.patch b/packages/busybox/busybox-1.00/slugos/udhcpscript.patch
index 010f64a53f..010f64a53f 100644
--- a/packages/busybox/busybox-1.00/openslug/udhcpscript.patch
+++ b/packages/busybox/busybox-1.00/slugos/udhcpscript.patch
diff --git a/packages/busybox/busybox-1.01/openslug/.mtn2git_empty b/packages/busybox/busybox-1.01/slugos/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/busybox/busybox-1.01/openslug/.mtn2git_empty
+++ b/packages/busybox/busybox-1.01/slugos/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.01/openslug/defconfig b/packages/busybox/busybox-1.01/slugos/defconfig
index 7debaeced2..7debaeced2 100644
--- a/packages/busybox/busybox-1.01/openslug/defconfig
+++ b/packages/busybox/busybox-1.01/slugos/defconfig
diff --git a/packages/busybox/busybox-1.01/openslug/udhcpscript.patch b/packages/busybox/busybox-1.01/slugos/udhcpscript.patch
index 010f64a53f..010f64a53f 100644
--- a/packages/busybox/busybox-1.01/openslug/udhcpscript.patch
+++ b/packages/busybox/busybox-1.01/slugos/udhcpscript.patch
diff --git a/packages/initscripts/initscripts-1.0/openslug/.mtn2git_empty b/packages/initscripts/initscripts-1.0/slugos/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/initscripts/initscripts-1.0/openslug/.mtn2git_empty
+++ b/packages/initscripts/initscripts-1.0/slugos/.mtn2git_empty
diff --git a/packages/initscripts/initscripts-1.0/openslug/alignment.sh b/packages/initscripts/initscripts-1.0/slugos/alignment.sh
index bf193cb01c..bf193cb01c 100644
--- a/packages/initscripts/initscripts-1.0/openslug/alignment.sh
+++ b/packages/initscripts/initscripts-1.0/slugos/alignment.sh
diff --git a/packages/initscripts/initscripts-1.0/openslug/banner b/packages/initscripts/initscripts-1.0/slugos/banner
index d80fb19fe4..8e64235acb 100644
--- a/packages/initscripts/initscripts-1.0/openslug/banner
+++ b/packages/initscripts/initscripts-1.0/slugos/banner
@@ -1,4 +1,4 @@
 #!/bin/sh
 #NOTE: this script may execute with absolutely nothing
 # in /dev
-echo "OpenSlug booting..."
+echo "SlugOS booting..."
diff --git a/packages/initscripts/initscripts-1.0/openslug/device_table.txt b/packages/initscripts/initscripts-1.0/slugos/device_table.txt
index ae3cb79913..ae3cb79913 100644
--- a/packages/initscripts/initscripts-1.0/openslug/device_table.txt
+++ b/packages/initscripts/initscripts-1.0/slugos/device_table.txt
diff --git a/packages/initscripts/initscripts-1.0/openslug/devices.patch b/packages/initscripts/initscripts-1.0/slugos/devices.patch
index 26b1841d5b..26b1841d5b 100644
--- a/packages/initscripts/initscripts-1.0/openslug/devices.patch
+++ b/packages/initscripts/initscripts-1.0/slugos/devices.patch
diff --git a/packages/initscripts/initscripts-1.0/openslug/domainname.sh b/packages/initscripts/initscripts-1.0/slugos/domainname.sh
index 7113467d8c..7113467d8c 100644
--- a/packages/initscripts/initscripts-1.0/openslug/domainname.sh
+++ b/packages/initscripts/initscripts-1.0/slugos/domainname.sh
diff --git a/packages/initscripts/initscripts-1.0/openslug/rootopts.patch b/packages/initscripts/initscripts-1.0/slugos/rootopts.patch
index 3f2a925879..3f2a925879 100644
--- a/packages/initscripts/initscripts-1.0/openslug/rootopts.patch
+++ b/packages/initscripts/initscripts-1.0/slugos/rootopts.patch
diff --git a/packages/initscripts/initscripts-1.0/openslug/umountfs b/packages/initscripts/initscripts-1.0/slugos/umountfs
index d6f432dbda..d6f432dbda 100644
--- a/packages/initscripts/initscripts-1.0/openslug/umountfs
+++ b/packages/initscripts/initscripts-1.0/slugos/umountfs
diff --git a/packages/initscripts/initscripts-1.0/openslug/umountnfs.sh b/packages/initscripts/initscripts-1.0/slugos/umountnfs.sh
index 994a919225..994a919225 100644
--- a/packages/initscripts/initscripts-1.0/openslug/umountnfs.sh
+++ b/packages/initscripts/initscripts-1.0/slugos/umountnfs.sh
diff --git a/packages/initscripts/initscripts-openslug_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb
index 4e82022876..4ca1f8d36c 100644
--- a/packages/initscripts/initscripts-openslug_1.0.bb
+++ b/packages/initscripts/initscripts-slugos_1.0.bb
@@ -1,7 +1,7 @@
-# OpenSlug specific stuff for the init scripts.
+# SlugOS specific stuff for the init scripts.
 #
 # This is, in effect, an extended patch to fix various
-# problems in the initscripts on OpenSlug.  The problems
+# problems in the initscripts on SlugOS.  The problems
 # mostly come down to the order the scripts are executed
 # in.
 include initscripts_${PV}.bb
@@ -11,7 +11,7 @@ RCONFLICTS = "initscripts"
 # All other standard definitions inherited from initscripts
 # Except the PR which is hacked here.  The format used is
 # a suffix
-PR := "${PR}.3"
+PR := "${PR}.4"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
@@ -68,11 +68,11 @@ do_install_append() {
 		status=0
 		while read d
 		do
-			oenote "initscripts-openslug: unexpected link $f"
+			oenote "initscripts-slugos: unexpected link $f"
 			status = 1
 		done
 		test $status -eq 0 ||
-			oefatal "initscripts-openslug: new links break do_install"
+			oefatal "initscripts-slugos: new links break do_install"
 	}
 
 	# Set the run-level links
@@ -86,26 +86,26 @@ do_install_append() {
 	# udev runs at S 04 .
 	update-rc.d -r ${D} devices		start  5 S .
 	update-rc.d -r ${D} alignment.sh	start  7 S .
-	# busybox hwclock.sh (openslug-init) starts here (08)
-	# openslug-init umountinitrd runs here (09)
+	# busybox hwclock.sh (slugos-init) starts here (08)
+	# slugos-init umountinitrd runs here (09)
 
 	update-rc.d -r ${D} checkroot.sh	start 10 S .
-	# openslug buffer syslog starts here (11)
+	# slugos buffer syslog starts here (11)
 	# sysconfsetup runs at S 12
 	# modutils.sh runs at S 20
-	# checkfs.sh is currently disabled from S 30 (and won't work on OpenSlug)
-	# ramdisk is not used on OpenSlug, would run at S 30
+	# checkfs.sh is currently disabled from S 30 (and won't work on SlugOS)
+	# ramdisk is not used on SlugOS, would run at S 30
 	update-rc.d -r ${D} mountall.sh		start 35 S .
 	# base-files populate-volatile.sh runs at S37
 	update-rc.d -r ${D} devpts.sh		start 38 S .
-	# openslug file syslog starts here (39)
+	# slugos file syslog starts here (39)
 
 	# set hostname and domainname before the network script works (by
 	# entering them at level 40), networking may reset them.
 	update-rc.d -r ${D} domainname.sh	start 40 S .
 	update-rc.d -r ${D} hostname.sh		start 40 S .
 	# network runs at S 40
-	# openslug network syslog starts here (44)
+	# slugos network syslog starts here (44)
 	update-rc.d -r ${D} mountnfs.sh		start 45 S .
 
 	update-rc.d -r ${D} bootmisc.sh		start 55 S .
@@ -132,20 +132,20 @@ do_install_append() {
 	#
 	# urandom would stop at (S)30
 
-	# This is the special, correct, openslug umountnfs.sh (it looks in
+	# This is the special, correct, slugos umountnfs.sh (it looks in
 	# the /proc/mounts information, not /etc/fstab)
 	update-rc.d -r ${D} umountnfs.sh	start 31 0 6 .
 	# portmap stops at 32
-	# openslug network syslog stops here (39)
+	# slugos network syslog stops here (39)
 	# networking stops at 40 (nothing else does, believe me.)
 
-	# busybox hwclock.sh (openslug-init) stops here (45)
-	# openslug file syslog stops here (47)
-	# openslug buffer syslog stops here (49)
+	# busybox hwclock.sh (slugos-init) stops here (45)
+	# slugos file syslog stops here (47)
+	# slugos buffer syslog stops here (49)
 	# Remove any errant processes
 	update-rc.d -r ${D} sendsigs		start 60 0 6 .
 
-	# This is the special, correct, openslug umountfs, it will umount
+	# This is the special, correct, slugos umountfs, it will umount
 	# any network file systems which failed to umount before.
 	update-rc.d -r ${D} umountfs		start 70 0 6 .
 
diff --git a/packages/meta/ludeos-image.bb b/packages/meta/ludeos-image.bb
index a939d41531..669ff49634 100644
--- a/packages/meta/ludeos-image.bb
+++ b/packages/meta/ludeos-image.bb
@@ -1 +1 @@
-DEPENDS = openslug-image
\ No newline at end of file
+DEPENDS = slugos-image
\ No newline at end of file
diff --git a/packages/meta/ludeos-packages.bb b/packages/meta/ludeos-packages.bb
index 1f9a1865a2..6477c11e4c 100644
--- a/packages/meta/ludeos-packages.bb
+++ b/packages/meta/ludeos-packages.bb
@@ -1 +1 @@
-DEPENDS = openslug-packages
+DEPENDS = slugos-packages
diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb
index 1595337981..9be275c862 100644
--- a/packages/meta/slugos-image.bb
+++ b/packages/meta/slugos-image.bb
@@ -4,10 +4,8 @@
 # conf/distro/slugos.conf to get the standard settings).
 #
 LICENSE = "MIT"
-PR = "r16"
+PR = "r17"
 PROVIDES += "${SLUGOS_IMAGENAME}-image"
-#FIXME: backward compatibility wit