diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-06-18 14:29:29 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-06-18 14:29:29 -0400 |
| commit | 6d4520d45e945cebd5f3acfbda51c59ca0373dd9 (patch) | |
| tree | 912776c9bd088a56ee3f8b6acceb47bcfb4e9134 | |
| parent | 2b4e7e738c9385e20468f071b37a48f51cfee89f (diff) | |
| download | initscripts-6d4520d45e945cebd5f3acfbda51c59ca0373dd9.tar initscripts-6d4520d45e945cebd5f3acfbda51c59ca0373dd9.tar.gz initscripts-6d4520d45e945cebd5f3acfbda51c59ca0373dd9.tar.bz2 initscripts-6d4520d45e945cebd5f3acfbda51c59ca0373dd9.tar.xz initscripts-6d4520d45e945cebd5f3acfbda51c59ca0373dd9.zip | |
Use /etc/system-release instead of /etc/redhat-release
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/initscripts.spec b/initscripts.spec index 30bb1973..8ab3ccc2 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -24,7 +24,7 @@ Requires: upstart >= 0.6.0 Requires: SysVinit >= 2.85-38 %endif Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find -Requires: /etc/redhat-release +Requires: /etc/system-release Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 125-1 Requires: cpio diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 262c06c1..527050bd 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -247,21 +247,21 @@ init_crypto() { # Print a text banner. echo -en $"\t\tWelcome to " -read -r redhat_release < /etc/redhat-release -if [[ "$redhat_release" =~ "Red Hat" ]]; then +read -r system_release < /etc/system-release +if [[ "$system_release" =~ "Red Hat" ]]; then [ "$BOOTUP" = "color" ] && echo -en "\\033[0;31m" echo -en "Red Hat" [ "$BOOTUP" = "color" ] && echo -en "\\033[0;39m" - PRODUCT=$(sed "s/Red Hat \(.*\) release.*/\1/" /etc/redhat-release) + PRODUCT=$(sed "s/Red Hat \(.*\) release.*/\1/" /etc/system-release) echo " $PRODUCT" -elif [[ "$redhat_release" =~ "Fedora" ]]; then +elif [[ "$system_release" =~ "Fedora" ]]; then [ "$BOOTUP" = "color" ] && echo -en "\\033[0;34m" echo -en "Fedora" [ "$BOOTUP" = "color" ] && echo -en "\\033[0;39m" - PRODUCT=$(sed "s/Fedora \(.*\) \?release.*/\1/" /etc/redhat-release) + PRODUCT=$(sed "s/Fedora \(.*\) \?release.*/\1/" /etc/system-release) echo " $PRODUCT" else - PRODUCT=$(sed "s/ release.*//g" /etc/redhat-release) + PRODUCT=$(sed "s/ release.*//g" /etc/system-release) echo "$PRODUCT" fi if [ "$PROMPT" != "no" ]; then |