From ffdff07941620b6f1e9869772dd9a47b29639804 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 21 May 2013 15:35:34 +0200
Subject: Refactoring:

REQUIRED_DEPENDENCIES -> REQUIRED_INSTALLED_PACKAGES
REQUIRED_PACKAGES -> REQUIRED_CONTENT_PACKAGES
---
 remote/rootfs/rootfs-stage32/rootfs-stage32.build       | 2 +-
 remote/rootfs/rootfs-stage32/rootfs-stage32.conf        | 2 +-
 remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'remote/rootfs')

diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index 0ca8d64c..713c0a3d 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -4,7 +4,7 @@ fetch_source() {
 }
 
 build() {
-	if [ ! -z "$REQUIRED_PACKAGES" ]; then
+	if [ ! -z "$REQUIRED_CONTENT_PACKAGES" ]; then
 		COPYLIST="list_dpkg_output"
 		[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
 		list_packet_files >> "${COPYLIST}"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index a8bbf386..f5452f53 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -1,5 +1,5 @@
 REQUIRED_MODULES="	kernel"
-REQUIRED_DEPENDENCIES="nfs-common aufs-tools squashfs-tools whois xfsprogs"
+REQUIRED_INSTALLED_PACKAGES="nfs-common aufs-tools squashfs-tools whois xfsprogs"
 REQUIRED_BINARIES="	bash
 			more
 			less
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index 8543a284..dbbd4697 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
@@ -1,7 +1,7 @@
 pinfo "If aufs install fails, run zypper addrepo http://jftp.inai.de/openSUSE_12.3/ j.eng-i586"
 REQUIRED_MODULES="	kernel"
-REQUIRED_DEPENDENCIES="nfs-client aufs squashfs"
-REQUIRED_PACKAGES="timezone"
+REQUIRED_INSTALLED_PACKAGES="nfs-client aufs squashfs"
+REQUIRED_CONTENT_PACKAGES="timezone"
 REQUIRED_BINARIES="	bash
 			agetty
 			cat
-- 
cgit v1.2.3-55-g7522