wic: Consider PSEUDO_* environment variables

PATCH New Ed Bartosh 1 participant 1 message Mar 16, 2015

lore

Share & tools

lore

Ed Bartosh

author

2015-03-16 10:58 UTC #0 lore raw

PATCH 1/1 wic: Consider PSEUDO_* environment variables

Used default values of PSEUDO_* environment variables only if variables are not set.

This allows to set custom PSEUDO_PREFIX and other pseudo variables in order to use pseudo database from non-standard locations.

Change-Id I0bc1af5e521121d1f96d590cb6edb23cf0cb0b83

Signed-off-by Ed Bartosh <[email protected]>

---
 scripts/lib/wic/kickstart/custom_commands/partition.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

scripts/lib/wic/kickstart/custom_commands/partition.py +9 -4

index 4f5a1e5..f3d553b 100644
@@ -193,10 +193,15 @@ class Wic_PartData(Mic_PartData):
 
         Currently handles ext2/3/4, btrfs and vfat.
         """
-        pseudo = "export PSEUDO_PREFIX=%s/usr;" % native_sysroot
-        pseudo += "export PSEUDO_LOCALSTATEDIR=%s/../pseudo;" % rootfs_dir
-        pseudo += "export PSEUDO_PASSWD=%s;" % rootfs_dir
-        pseudo += "export PSEUDO_NOSYMLINKEXP=1;"
+        p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot)
+        p_localstatedir = os.environ.get("PSEUDO_LOCALSTATEDIR",
+                                         "%s/../pseudo" % rootfs_dir)
+        p_passwd = os.environ.get("PSEUDO_PASSWD", rootfs_dir)
+        p_nosymlinkexp = os.environ.get("PSEUDO_NOSYMLINKEXP", "1")
+        pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix
+        pseudo += "export PSEUDO_LOCALSTATEDIR=%s;" % p_localstatedir
+        pseudo += "export PSEUDO_PASSWD=%s;" % p_passwd
+        pseudo += "export PSEUDO_NOSYMLINKEXP=%s;" % p_nosymlinkexp
         pseudo += "%s/usr/bin/pseudo " % native_sysroot
 
         if self.fstype.startswith("ext"):

Signature · 1 line

2.1.4