diff options
| author | Muayyad Alsadi <alsadi@ojuba.org> | 2008-09-29 10:34:21 -0400 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2008-09-29 10:34:21 -0400 |
| commit | 254097107fc71b1e5ce22c86e89cce6d492d8322 (patch) | |
| tree | 52f1be709f33032ce24a084e39c5e66fb7bb3c3b /liveinst | |
| parent | 9151a2417608f89a0f7b7e0f75023e1a3f536ee6 (diff) | |
| download | anaconda-254097107fc71b1e5ce22c86e89cce6d492d8322.tar.gz anaconda-254097107fc71b1e5ce22c86e89cce6d492d8322.tar.xz anaconda-254097107fc71b1e5ce22c86e89cce6d492d8322.zip | |
Set ANACONDA_PRODUCTNAME, etc from /etc/system-release (#464120)
Diffstat (limited to 'liveinst')
| -rw-r--r-- | liveinst/liveinst.desktop.in | 2 | ||||
| -rw-r--r-- | liveinst/liveinst.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/liveinst/liveinst.desktop.in b/liveinst/liveinst.desktop.in index f28444665..c10287279 100644 --- a/liveinst/liveinst.desktop.in +++ b/liveinst/liveinst.desktop.in @@ -6,7 +6,7 @@ Categories=System;Utility;X-Red-Hat-Base;X-Fedora;GNOME;GTK; Exec=/usr/bin/liveinst Terminal=false Type=Application -Icon=fedora-logo-icon +Icon=system-software-installer Encoding=UTF-8 StartupNotify=true NoDisplay=true diff --git a/liveinst/liveinst.sh b/liveinst/liveinst.sh index f06ba3166..36c977252 100644 --- a/liveinst/liveinst.sh +++ b/liveinst/liveinst.sh @@ -34,9 +34,9 @@ fi # load modules that would get loaded by the loader... (#230945) for i in raid0 raid1 raid5 raid6 raid456 raid10 fat msdos gfs2 reiserfs ext2 ext3 jfs xfs dm-mod dm-zero dm-mirror dm-snapshot dm-multipath dm-round-robin vfat ; do /sbin/modprobe $i ; done -export ANACONDA_PRODUCTNAME="Fedora" -export ANACONDA_PRODUCTVERSION=$(rpm -q fedora-release --qf "%{VERSION}") -export ANACONDA_BUGURL="https://bugzilla.redhat.com/bugzilla/" +export ANACONDA_PRODUCTNAME=$( cat /etc/system-release | cut -d ' ' -f 1 ) +export ANACONDA_PRODUCTVERSION=$( cat /etc/system-release | sed -r -e 's/^.*([0-9]+) *\(.*$/\1/' ) +export ANACONDA_BUGURL=${ANACONDA_BUGURL:="https://bugzilla.redhat.com/bugzilla/"} export PATH=/sbin:/usr/sbin:$PATH |