From 20461885d6fe79694431bca8ca9382090fa8f350 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 16 Jul 2005 08:00:12 +0000
Subject: Moved OpenSlug root home directory from /home/root to simply /root

---
 packages/base-files/base-files_3.0.14.bb                        | 4 +++-
 packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch | 2 +-
 packages/base-passwd/base-passwd_3.5.9.bb                       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index cb648f2448..3d93b5118e 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r36"
+PR = "r37"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -124,6 +124,8 @@ do_install_append_nylon() {
 do_install_append_openslug() {
 	printf "" "" >${D}${sysconfdir}/resolv.conf
 	rm -r ${D}/mnt/*
+	rmdir /home/root
+	install -m 0755 -d ${D}/root
 }
 
 PACKAGES = "${PN}-doc ${PN}"
diff --git a/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
index e91dead23f..97dab68f33 100644
--- a/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
+++ b/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
@@ -2,7 +2,7 @@
 +++ base-passwd/passwd.master	2005-07-08 06:31:58.000000000 +0200
 @@ -1,4 +1,4 @@
 -root::0:0:root:/root:/bin/sh
-+root:Xm./49bYkrkuo:0:0:root:/home/root:/bin/sh
++root:Xm./49bYkrkuo:0:0:root:/root:/bin/sh
  daemon:*:1:1:daemon:/usr/sbin:/bin/sh
  bin:*:2:2:bin:/bin:/bin/sh
  sys:*:3:3:sys:/dev:/bin/sh
diff --git a/packages/base-passwd/base-passwd_3.5.9.bb b/packages/base-passwd/base-passwd_3.5.9.bb
index 72caba0223..6fcb211bda 100644
--- a/packages/base-passwd/base-passwd_3.5.9.bb
+++ b/packages/base-passwd/base-passwd_3.5.9.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Base system password/group files."
 SECTION = "base"
-PR = "r1"
+PR = "r2"
 LICENSE = "GPL"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
-- 
cgit v1.2.3


From 09457f63dad154101bdfcaadd54d79671fdca025 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 16 Jul 2005 08:05:02 +0000
Subject: Fixed the OpenSlug root move

---
 packages/base-files/base-files_3.0.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 3d93b5118e..d546ed5c09 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -124,7 +124,7 @@ do_install_append_nylon() {
 do_install_append_openslug() {
 	printf "" "" >${D}${sysconfdir}/resolv.conf
 	rm -r ${D}/mnt/*
-	rmdir /home/root
+	rmdir ${D}/home/root
 	install -m 0755 -d ${D}/root
 }
 
-- 
cgit v1.2.3