[spin-kickstarts] kde: add bug #808062 reference
by Rex Dieter
commit 4d94d5235b2fc270b784384693103db97bf8d9d0
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon May 14 15:23:32 2012 -0500
kde: add bug #808062 reference
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 12b2c93..583894f 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -33,7 +33,7 @@ DESKTOP="KDE"
DISPLAYMANAGER="KDE"
EOF
-# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070)
+# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070, #808062)
cat > /root/.gtkrc-2.0 << EOF
include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
include "/etc/gtk-2.0/gtkrc"
11 years, 11 months
[spin-kickstarts] Revert "fedora-live-kde-base.ks: Drop the workaround for GTK+ apps running as root."
by Rex Dieter
commit 3bcca4d1c47d8ec22e3e2e4dbaab326eee9b7bc6
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon May 14 15:22:56 2012 -0500
Revert "fedora-live-kde-base.ks: Drop the workaround for GTK+ apps running as root."
This reverts commit 7f9656a5ab2113a603fb8e602fc04c62b1e1bbf7.
fedora-live-kde-base.ks | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index 14edfd5..12b2c93 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -33,6 +33,17 @@ DESKTOP="KDE"
DISPLAYMANAGER="KDE"
EOF
+# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070)
+cat > /root/.gtkrc-2.0 << EOF
+include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
+include "/etc/gtk-2.0/gtkrc"
+gtk-theme-name="oxygen-gtk"
+EOF
+cat > /root/.config/gtk-3.0/settings.ini << EOF
+[Settings]
+gtk-theme-name = oxygen-gtk
+EOF
+
# add initscript
cat >> /etc/rc.d/init.d/livesys << EOF
11 years, 11 months
[spin-kickstarts/f17] kde: add bug #808062 reference
by Rex Dieter
commit 85a9f5de70c3f8c8e3ba8d6fe0650d73861d0fd5
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon May 14 15:23:32 2012 -0500
kde: add bug #808062 reference
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 12b2c93..583894f 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -33,7 +33,7 @@ DESKTOP="KDE"
DISPLAYMANAGER="KDE"
EOF
-# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070)
+# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070, #808062)
cat > /root/.gtkrc-2.0 << EOF
include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
include "/etc/gtk-2.0/gtkrc"
11 years, 11 months
[spin-kickstarts/f17] Revert "fedora-live-kde-base.ks: Drop the workaround for GTK+ apps running as root."
by Rex Dieter
commit 97615d0fc8d052cbc88c2056ddb40935f37a2496
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon May 14 15:22:56 2012 -0500
Revert "fedora-live-kde-base.ks: Drop the workaround for GTK+ apps running as root."
This reverts commit 7f9656a5ab2113a603fb8e602fc04c62b1e1bbf7.
fedora-live-kde-base.ks | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index 14edfd5..12b2c93 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -33,6 +33,17 @@ DESKTOP="KDE"
DISPLAYMANAGER="KDE"
EOF
+# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070)
+cat > /root/.gtkrc-2.0 << EOF
+include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
+include "/etc/gtk-2.0/gtkrc"
+gtk-theme-name="oxygen-gtk"
+EOF
+cat > /root/.config/gtk-3.0/settings.ini << EOF
+[Settings]
+gtk-theme-name = oxygen-gtk
+EOF
+
# add initscript
cat >> /etc/rc.d/init.d/livesys << EOF
11 years, 11 months
Re: [Fedora-spins] /dev/live, /mnt/live, LiveOS/home.img unavailable in Fedora-17
by Frederick Grose
On Mon, Mar 26, 2012 at 12:02 PM, Frederick Grose <fgrose(a)gmail.com> wrote:
> Please note that the current Fedora-17-Beta-TC2-Live images lack
> some traditional Live CD/USB features.
>
> See this bug report.
> https://bugzilla.redhat.com/show_bug.cgi?id=740280
>
> /dev/live was a link to the installation partition on the Live USB, such
> as /dev/sdc1,
> or /dev/sr0 on a Live CD/DVD.
>
> How would a script determine this partition without human input?
>
> /mnt/live was a convenient mounting of the installation partition
> filesystem.
> It allowed easy access to pre-existing content on the Live USB device or to
> the /LiveOS and /syslinux directories.
>
> The --home-size-mb NNN option of livecd-iso-to-disk produced a
> /LiveOS/home.img
> filesystem for the liveuser's home directory.
>
> This feature made possible the --encrypted-home option, which would secure
> the privacy of a user directory on a Live USB system.
>
> The home.img filesystem was also read/write/delete without consuming the
> LiveOS overlay. This is important for non-short-term Live USB deployments,
> such as Sugar on a Stick, where overlay exhaustion can be a significant
> problem.
>
> Is there a workaround for these (missing) features?
>
> --Fred
>
This patch restores the lost features:
commit 1580cddaea504efd68c5e10fee70e09d7e81d86b
Author: Frederick Grose <fgrose(a)sugarlabs.org>
Date: Thu Mar 29 16:27:30 2012 -0400
Mount live device on /mnt/live, link it to /dev/live
This enables the mounting of /LiveOS/home.img, if present.
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 0b14fec..0cf0fb2 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -88,10 +88,22 @@ touch /.liveimg-configured
# Make sure we don't mangle the hardware clock on shutdown
ln -sf /dev/null /etc/systemd/system/hwclock-save.service
+findmount() {
+ local info=()
+ while read -a info; do
+ if [[ ${info[4]} == $1 ]]; then
+ echo ${info[8]}
+ break;
+ fi
+ done < /proc/self/mountinfo
+}
+
# mount live image
-if [ -b \`readlink -f /dev/live\` ]; then
+livedev=$(findmount /run/initramfs/live)
+if [[ -b $livedev ]]; then
mkdir -p /mnt/live
- mount -o ro /dev/live /mnt/live 2>/dev/null || mount /dev/live /mnt/live
+ mount -o ro $livedev /mnt/live 2>/dev/null || mount $livedev /mnt/live
+ ln -s $livedev /dev/live
fi
livedir="LiveOS"
@@ -220,7 +232,7 @@ if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then
# io errors due to not being able to get files...
#cat /sbin/halt > /dev/null
#cat /sbin/reboot > /dev/null
-#/usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1
+#/usr/sbin/eject -p -m \$livedev >/dev/null 2>&1
#echo "Please remove the CD from your drive and press Enter to finish
restarting"
#read -t 30 < /dev/console
FOE
11 years, 11 months
[spin-kickstarts] remove wine from scientifc-kde its not supported in the releng process
by Dennis Gilmore
commit e54395352042566ce6c03f80ecb1a405b2cd7daa
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat May 12 10:35:05 2012 -0500
remove wine from scientifc-kde its not supported in the releng process
fedora-livedvd-scientific-kde.ks | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific-kde.ks
index f544872..2c7614d 100644
--- a/fedora-livedvd-scientific-kde.ks
+++ b/fedora-livedvd-scientific-kde.ks
@@ -127,7 +127,6 @@ screen
rlwrap
xchat
shutter
-wine
fig2ps
bibtex2html
hevea
11 years, 11 months
[spin-kickstarts/f17] remove wine from scientific-kde its not supported in the releng processes
by Dennis Gilmore
commit f927193ba839ecfdc6eae2bc1f1c0703cf982792
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat May 12 10:34:01 2012 -0500
remove wine from scientific-kde its not supported in the releng processes
fedora-livedvd-scientific-kde.ks | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific-kde.ks
index 37a8e9b..9a7c8bf 100644
--- a/fedora-livedvd-scientific-kde.ks
+++ b/fedora-livedvd-scientific-kde.ks
@@ -127,7 +127,6 @@ screen
rlwrap
xchat
shutter
-wine
fig2ps
bibtex2html
hevea
11 years, 11 months
[spin-kickstarts] put back escaping, revert other unjustified syntax changes from fgrose
by Adam Williamson
commit 3ac66a0add9f028b9b9d1084a20616a074d3b8f9
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Tue May 8 12:37:27 2012 -0700
put back escaping, revert other unjustified syntax changes from fgrose
fedora-live-base.ks | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 54df915..7f3bafe 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -103,9 +103,8 @@ if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
action "Enabling swap partition \$s" swapon \$s
done
fi
-if ! strstr "$(cat /proc/cmdline)" noswap &&
- [[ -f /run/initramfs/live/${livedir}/swap.img ]] ; then
- action "Enabling swap file" swapon /run/initramfs/live/${livedir}/swap.img
+if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then
+ action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img
fi
mountPersistentHome() {
@@ -120,7 +119,7 @@ mountPersistentHome() {
mountopts="-t jffs2"
elif [ ! -b "\$homedev" ]; then
loopdev=\`losetup -f\`
- if [[ ${homedev##/run/initramfs/live} != ${homedev} ]]; then
+ if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then
action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live
fi
losetup \$loopdev \$homedev
@@ -155,8 +154,8 @@ findPersistentHome() {
if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
findPersistentHome
-elif [[ -e /run/initramfs/live/${livedir}/home.img ]]; then
- homedev=/run/initramfs/live/${livedir}/home.img
+elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then
+ homedev=/run/initramfs/live/\${livedir}/home.img
fi
# if we have a persistent /home, then we want to go ahead and mount it
11 years, 11 months
[spin-kickstarts/f17] put back escaping, revert other unjustified syntax changes from fgrose
by Adam Williamson
commit c551b7dd85a39854c3c5ee10e7fe466d8d37ecea
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Tue May 8 12:37:27 2012 -0700
put back escaping, revert other unjustified syntax changes from fgrose
fedora-live-base.ks | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 54df915..7f3bafe 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -103,9 +103,8 @@ if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
action "Enabling swap partition \$s" swapon \$s
done
fi
-if ! strstr "$(cat /proc/cmdline)" noswap &&
- [[ -f /run/initramfs/live/${livedir}/swap.img ]] ; then
- action "Enabling swap file" swapon /run/initramfs/live/${livedir}/swap.img
+if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then
+ action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img
fi
mountPersistentHome() {
@@ -120,7 +119,7 @@ mountPersistentHome() {
mountopts="-t jffs2"
elif [ ! -b "\$homedev" ]; then
loopdev=\`losetup -f\`
- if [[ ${homedev##/run/initramfs/live} != ${homedev} ]]; then
+ if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then
action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live
fi
losetup \$loopdev \$homedev
@@ -155,8 +154,8 @@ findPersistentHome() {
if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
findPersistentHome
-elif [[ -e /run/initramfs/live/${livedir}/home.img ]]; then
- homedev=/run/initramfs/live/${livedir}/home.img
+elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then
+ homedev=/run/initramfs/live/\${livedir}/home.img
fi
# if we have a persistent /home, then we want to go ahead and mount it
11 years, 11 months
[spin-kickstarts] Substitute /run/initramfs/live for /mnt/live (from fgrose)
by Adam Williamson
commit 99cd6d592ed887858d52d9cbf5958ac9562d178c
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Tue May 8 12:11:15 2012 -0700
Substitute /run/initramfs/live for /mnt/live (from fgrose)
This is needed to enable mounting of home.img and swap.img in
Fedora 17 LiveOS installations.
fedora-live-base.ks | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 0b14fec..54df915 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -88,12 +88,6 @@ touch /.liveimg-configured
# Make sure we don't mangle the hardware clock on shutdown
ln -sf /dev/null /etc/systemd/system/hwclock-save.service
-# mount live image
-if [ -b \`readlink -f /dev/live\` ]; then
- mkdir -p /mnt/live
- mount -o ro /dev/live /mnt/live 2>/dev/null || mount /dev/live /mnt/live
-fi
-
livedir="LiveOS"
for arg in \`cat /proc/cmdline\` ; do
if [ "\${arg##live_dir=}" != "\${arg}" ]; then
@@ -109,8 +103,9 @@ if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
action "Enabling swap partition \$s" swapon \$s
done
fi
-if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /mnt/live/\${livedir}/swap.img ] ; then
- action "Enabling swap file" swapon /mnt/live/\${livedir}/swap.img
+if ! strstr "$(cat /proc/cmdline)" noswap &&
+ [[ -f /run/initramfs/live/${livedir}/swap.img ]] ; then
+ action "Enabling swap file" swapon /run/initramfs/live/${livedir}/swap.img
fi
mountPersistentHome() {
@@ -125,8 +120,8 @@ mountPersistentHome() {
mountopts="-t jffs2"
elif [ ! -b "\$homedev" ]; then
loopdev=\`losetup -f\`
- if [ "\${homedev##/mnt/live}" != "\${homedev}" ]; then
- action "Remounting live store r/w" mount -o remount,rw /mnt/live
+ if [[ ${homedev##/run/initramfs/live} != ${homedev} ]]; then
+ action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live
fi
losetup \$loopdev \$homedev
homedev=\$loopdev
@@ -160,8 +155,8 @@ findPersistentHome() {
if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
findPersistentHome
-elif [ -e /mnt/live/\${livedir}/home.img ]; then
- homedev=/mnt/live/\${livedir}/home.img
+elif [[ -e /run/initramfs/live/${livedir}/home.img ]]; then
+ homedev=/run/initramfs/live/${livedir}/home.img
fi
# if we have a persistent /home, then we want to go ahead and mount it
@@ -220,7 +215,7 @@ if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then
# io errors due to not being able to get files...
#cat /sbin/halt > /dev/null
#cat /sbin/reboot > /dev/null
-#/usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1
+#/usr/sbin/eject -p -m \$(readlink -f /run/initramfs/livedev) >/dev/null 2>&1
#echo "Please remove the CD from your drive and press Enter to finish restarting"
#read -t 30 < /dev/console
FOE
11 years, 11 months