Browse code

Patch mkimage-yum.sh to work with Amazon Linux (2014.09)

Signed-off-by: Lance Kinley <lkinley@loyaltymethods.com>

Lance Kinley authored on 2015/02/19 08:07:31
Showing 1 changed files
... ...
@@ -57,6 +57,12 @@ mknod -m 666 "$target"/dev/tty0 c 4 0
57 57
 mknod -m 666 "$target"/dev/urandom c 1 9
58 58
 mknod -m 666 "$target"/dev/zero c 1 5
59 59
 
60
+# amazon linux yum will fail without vars set
61
+if [ -d /etc/yum/vars ]; then
62
+	mkdir -p -m 755 "$target"/etc/yum
63
+	cp -a /etc/yum/vars "$target"/etc/yum/
64
+fi
65
+
60 66
 yum -c "$yum_config" --installroot="$target" --releasever=/ --setopt=tsflags=nodocs \
61 67
     --setopt=group_package_types=mandatory -y groupinstall Core
62 68
 yum -c "$yum_config" --installroot="$target" -y clean all
... ...
@@ -83,9 +89,13 @@ rm -rf "$target"/etc/ld.so.cache
83 83
 rm -rf "$target"/var/cache/ldconfig/*
84 84
 
85 85
 version=
86
-if [ -r "$target"/etc/redhat-release ]; then
87
-    version="$(sed 's/^[^0-9\]*\([0-9.]\+\).*$/\1/' "$target"/etc/redhat-release)"
88
-fi
86
+for file in "$target"/etc/{redhat,system}-release
87
+do
88
+    if [ -r "$file" ]; then
89
+        version="$(sed 's/^[^0-9\]*\([0-9.]\+\).*$/\1/' "$file")"
90
+        break
91
+    fi
92
+done
89 93
 
90 94
 if [ -z "$version" ]; then
91 95
     echo >&2 "warning: cannot autodetect OS version, using '$name' as tag"