[spin-kickstarts] kde: drop reference to /etc/sysconfig/desktop
by Rex Dieter
commit 58fd2bb1b342c967e7d368de13d9327a4a3f26c2
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Fri Sep 25 09:19:13 2015 -0500
kde: drop reference to /etc/sysconfig/desktop
deprecated long ago
fedora-live-kde-base.ks | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index b38795c..81fc0c2 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -7,12 +7,6 @@
%post
-# create /etc/sysconfig/desktop (needed for installation)
-cat > /etc/sysconfig/desktop <<EOF
-DESKTOP="KDE"
-DISPLAYMANAGER="KDE"
-EOF
-
# set default GTK+ theme for root (see #683855, #689070, #808062)
cat > /root/.gtkrc-2.0 << EOF
include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
8 years, 6 months
[spin-kickstarts/f23] explicitly mkdir Desktop dir
by Rex Dieter
commit 330c56ad285d46b278fc0a80f9a3ac55108f881d
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Fri Sep 25 09:12:33 2015 -0500
explicitly mkdir Desktop dir
workaround https://bugzilla.redhat.com/show_bug.cgi?id=1266243
fedora-live-kde-base.ks | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index de5a019..3911611 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -60,9 +60,10 @@ MENU_EOF
# show liveinst.desktop on desktop and in menu
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-
-# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
+# set executable bit disable KDE security warning
chmod +x /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
# copy over the icons for liveinst to hicolor
cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
8 years, 6 months
[spin-kickstarts] kde: update default favorites
by Rex Dieter
commit 3dc4603931ee8bd0d25c810e9f85544ad062007d
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Fri Sep 25 09:17:20 2015 -0500
kde: update default favorites
fedora-live-kde-base.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index 59c0a29..b38795c 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -55,7 +55,7 @@ fi
mkdir -p /home/liveuser/.config/
cat > /home/liveuser/.config/kickoffrc << MENU_EOF
[Favorites]
-FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
+FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
MENU_EOF
# show liveinst.desktop on desktop and in menu
8 years, 6 months
[spin-kickstarts] drop liveinst icon hack
by Rex Dieter
commit 93c87e947c2f9d5eda61595dfd9fa2042dd5ea5d
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Fri Sep 25 09:14:15 2015 -0500
drop liveinst icon hack
no longer needed, and needlessly invalidates icon cache
fedora-live-kde-base.ks | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index 3911611..59c0a29 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -65,15 +65,6 @@ chmod +x /usr/share/applications/liveinst.desktop
mkdir /home/liveuser/Desktop
cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
-# copy over the icons for liveinst to hicolor
-cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
-cp /usr/share/icons/gnome/22x22/apps/system-software-install.png /usr/share/icons/hicolor/22x22/apps/
-cp /usr/share/icons/gnome/24x24/apps/system-software-install.png /usr/share/icons/hicolor/24x24/apps/
-cp /usr/share/icons/gnome/32x32/apps/system-software-install.png /usr/share/icons/hicolor/32x32/apps/
-cp /usr/share/icons/gnome/48x48/apps/system-software-install.png /usr/share/icons/hicolor/48x48/apps/
-cp /usr/share/icons/gnome/256x256/apps/system-software-install.png /usr/share/icons/hicolor/256x256/apps/
-touch /usr/share/icons/hicolor/
-
# Set akonadi backend
mkdir -p /home/liveuser/.config/akonadi
cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
8 years, 6 months
[spin-kickstarts] explicitly mkdir Desktop dir
by Rex Dieter
commit 22c37e61caa771c64a6af77f4b8ccef04f52989d
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Fri Sep 25 09:12:33 2015 -0500
explicitly mkdir Desktop dir
workaround https://bugzilla.redhat.com/show_bug.cgi?id=1266243
fedora-live-kde-base.ks | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index de5a019..3911611 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -60,9 +60,10 @@ MENU_EOF
# show liveinst.desktop on desktop and in menu
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-
-# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
+# set executable bit disable KDE security warning
chmod +x /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
# copy over the icons for liveinst to hicolor
cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
8 years, 6 months
F23: lorax says "no files matched etc/systemd/logind.conf"
by Mark Montague
I use pungi under Fedora 23 Alpha (fully updated) to build DVD images
containing repositories for use with Kickstart. This was working until
a "dnf upgrade" sometime between September 9th and September 14th, when
pungi started failing due to lorax encountering an error saying "no
files matched etc/systemd/logind.conf". Before I open a bugzilla
report, is anyone else seeing this problem or does anyone have advice
for how I should investigate it further?
I reproduced the problem with the standard
/usr/share/spin-kickstarts/fedora-install-server.ks which has only the
following modifications (specifying the release and arch prevents lorax
from saying the mirrorlist does not contain any URLs):
--- fedora-install-server.ks.orig 2015-08-19 15:17:00.609994154 +0000
+++ fedora-install-server.ks 2015-09-17 15:02:46.302145106 +0000
@@ -20,8 +20,8 @@
#repo --name=rawhide-source
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
--excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
# In non-master branches the fedora repo commands should be uncommented
-repo --name=fedora
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
--excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
-repo --name=fedora-source
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
--excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=fedora
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-23&arch=x86_64
--excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=fedora-source
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-23&arch=x86_64
--excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
# Package manifest for the compose. Uses repo group metadata to
translate groups.
# (default groups for the configured repos are added by --default)
I then run pungi using the command ("--nomacboot" is only because I do
not have the Mac filesystem kernel modules loaded):
time pungi --nomacboot --flavor="Kickstart" --name="Fedora" --ver="23" \
--config=/usr/share/spin-kickstarts/fedora-install-server.ks
This command fails with the following error:
DEBUG:pylorax.ltmpl:template line 14: symlink anaconda-shell@.service
lib/systemd/system/autovt@.service
DEBUG:pylorax.ltmpl:template line 15: replace #ReserveVT=6 ReserveVT=2
etc/systemd/logind.conf
2015-09-17 15:24:16,588: template command error in runtime-postinstall.tmpl:
template command error in runtime-postinstall.tmpl:
ERROR:pylorax.ltmpl:template command error in runtime-postinstall.tmpl:
2015-09-17 15:24:16,588: replace #ReserveVT=6 ReserveVT=2
etc/systemd/logind.conf
replace #ReserveVT=6 ReserveVT=2 etc/systemd/logind.conf
ERROR:pylorax.ltmpl: replace #ReserveVT=6 ReserveVT=2
etc/systemd/logind.conf
2015-09-17 15:24:16,589: OSError: no files matched etc/systemd/logind.conf
OSError: no files matched etc/systemd/logind.conf
ERROR:pylorax.ltmpl: OSError: no files matched etc/systemd/logind.conf
DEBUG:pylorax.ltmpl: Traceback (most recent call last):
DEBUG:pylorax.ltmpl: File
"/usr/lib/python3.4/site-packages/pylorax/ltmpl.py", line 289, in replace
DEBUG:pylorax.ltmpl: raise IOError("no files matched %s" % "
".join(fileglobs))
DEBUG:pylorax.ltmpl: OSError: no files matched etc/systemd/logind.conf
Traceback (most recent call last):
File "/usr/sbin/lorax", line 317, in <module>
main(sys.argv)
File "/usr/sbin/lorax", line 205, in main
remove_temp=True, verify=opts.verify)
File "/usr/lib/python3.4/site-packages/pylorax/__init__.py", line
277, in run
rb.postinstall()
File "/usr/lib/python3.4/site-packages/pylorax/treebuilder.py", line
142, in postinstall
self._runner.run("runtime-postinstall.tmpl", configdir=configdir_path)
File "/usr/lib/python3.4/site-packages/pylorax/ltmpl.py", line 191,
in run
self._run(commands)
File "/usr/lib/python3.4/site-packages/pylorax/ltmpl.py", line 210,
in _run
f(*args)
File "/usr/lib/python3.4/site-packages/pylorax/ltmpl.py", line 289,
in replace
raise IOError("no files matched %s" % " ".join(fileglobs))
OSError: no files matched etc/systemd/logind.conf
real 20m54.647s
user 2m43.002s
sys 0m30.241s
[root@f23ksb pungi]#
The full output of the pungi command is temporarily available at
http://www-personal.umich.edu/~markmont/pungi.log
in case anyone wants to see what happened earlier in the run.
Has anyone else seen this problem? Any ideas for troubleshooting it?
--
Mark Montague
mark(a)catseye.org
8 years, 6 months
[spin-kickstarts] adjust linux-firmware for cloud images
by Peter Robinson
commit 78114bb82fad5686bdfc166e9b9af098c04c2630
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Wed Sep 23 07:16:18 2015 +0100
adjust linux-firmware for cloud images
fedora-cloud-base.ks | 5 +++--
fedora-cloud-bigdata.ks | 4 +++-
fedora-cloud-experimental.ks | 4 +++-
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 29fb800..0ede38f 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -122,8 +122,9 @@ echo .
# this is installed by default but we don't need it in virt
# Commenting out the following for #1234504
-#echo "Removing linux-firmware package."
-#dnf -C -y erase linux-firmware
+# rpm works just fine for removing this, no idea why dnf can't cope
+echo "Removing linux-firmware package."
+rpm -e linux-firmware
# Remove firewalld; was supposed to be optional in F18+, but is pulled in
# in install/image building.
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index dfd8cf6..987ee5f 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -108,8 +108,10 @@ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
# this is installed by default but we don't need it in virt
+# Commenting out the following for #1234504
+# rpm works just fine for removing this, no idea why dnf can't cope
echo "Removing linux-firmware package."
-yum -C -y remove linux-firmware
+rpm -e linux-firmware
# Remove firewalld; was supposed to be optional in F18+, but is required to
# be present for install/image building.
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index 727658f..02a0030 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -99,8 +99,10 @@ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
# this is installed by default but we don't need it in virt
+# Commenting out the following for #1234504
+# rpm works just fine for removing this, no idea why dnf can't cope
echo "Removing linux-firmware package."
-yum -C -y remove linux-firmware
+rpm -e linux-firmware
# Remove firewalld; was supposed to be optional in F18+, but is required to
# be present for install/image building.
8 years, 6 months
[spin-kickstarts/f23] adjust linux-firmware for cloud images
by Peter Robinson
commit 7764a782a585601c673fe3aa89bc320fa4c1a1b8
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Wed Sep 23 07:16:18 2015 +0100
adjust linux-firmware for cloud images
fedora-cloud-base.ks | 5 +++--
fedora-cloud-bigdata.ks | 4 +++-
fedora-cloud-experimental.ks | 4 +++-
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index f7ffbbf..c57c68b 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -118,8 +118,9 @@ echo .
# this is installed by default but we don't need it in virt
# Commenting out the following for #1234504
-#echo "Removing linux-firmware package."
-#dnf -C -y erase linux-firmware
+# rpm works just fine for removing this, no idea why dnf can't cope
+echo "Removing linux-firmware package."
+rpm -e linux-firmware
# Remove firewalld; was supposed to be optional in F18+, but is pulled in
# in install/image building.
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index dfd8cf6..987ee5f 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -108,8 +108,10 @@ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
# this is installed by default but we don't need it in virt
+# Commenting out the following for #1234504
+# rpm works just fine for removing this, no idea why dnf can't cope
echo "Removing linux-firmware package."
-yum -C -y remove linux-firmware
+rpm -e linux-firmware
# Remove firewalld; was supposed to be optional in F18+, but is required to
# be present for install/image building.
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index 727658f..02a0030 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -99,8 +99,10 @@ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
# this is installed by default but we don't need it in virt
+# Commenting out the following for #1234504
+# rpm works just fine for removing this, no idea why dnf can't cope
echo "Removing linux-firmware package."
-yum -C -y remove linux-firmware
+rpm -e linux-firmware
# Remove firewalld; was supposed to be optional in F18+, but is required to
# be present for install/image building.
8 years, 6 months
[spin-kickstarts] disable kwallet migrator
by Rex Dieter
commit b44bc5a578e324c2196c437dde19d47653820565
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Mon Sep 21 20:16:13 2015 -0500
disable kwallet migrator
fedora-live-kde-base.ks | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index 0179924..de5a019 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -97,6 +97,12 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
Enabled=false
KRES_EOF
+# Disable kwallet migrator
+cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
+[Migration]
+alreadyMigrated=true
+KWALLET_EOL
+
# make sure to set the right permissions and selinux contexts
chown -R liveuser:liveuser /home/liveuser/
restorecon -R /home/liveuser/
8 years, 6 months
[spin-kickstarts/f23] disable kwallet migrator
by Rex Dieter
commit 0f26c21c8dfc2dd43d095a1524876d49e0becbbf
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Mon Sep 21 20:16:13 2015 -0500
disable kwallet migrator
fedora-live-kde-base.ks | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index 0179924..de5a019 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -97,6 +97,12 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
Enabled=false
KRES_EOF
+# Disable kwallet migrator
+cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
+[Migration]
+alreadyMigrated=true
+KWALLET_EOL
+
# make sure to set the right permissions and selinux contexts
chown -R liveuser:liveuser /home/liveuser/
restorecon -R /home/liveuser/
8 years, 6 months