[spin-kickstarts/f17] Substitute /run/initramfs/live for /mnt/live (from fgrose)
by Adam Williamson
commit c09b6a5463e2d667bbd026b0625394e6273a4cca
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, 10 months
[spin-kickstarts/f17] Security Spin - iptraf-ng obsoletes iptraf
by Bruno Wolff III
commit 541aa43b726c06aae3d2bc8b5e9d384e51bf8675
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sun May 6 10:06:28 2012 -0500
Security Spin - iptraf-ng obsoletes iptraf
Even though iptraf isn't blocked in f17, since iptraf-ng obsoletes
it, we end up with iptraf-ng on the spin.
This change was already made in master as part of a bigger commit.
fedora-livecd-security.ks | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/fedora-livecd-security.ks b/fedora-livecd-security.ks
index dae4be4..82c3ec0 100644
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@@ -186,8 +186,8 @@ ettercap
ettercap-gtk
# rCommand: packETH
packETH
-# rCommand: iptraf
-iptraf
+# rCommand: iptraf-ng
+iptraf-ng
pcapdiff
# rCommand: etherape
etherape
11 years, 10 months
[spin-kickstarts/f17] SoaS: update details
by Peter Robinson
commit c26af6c68ccbdcfcb539bbe4c69de4387354b3fc
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Sun May 6 09:36:16 2012 +0100
SoaS: update details
fedora-livecd-soas.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 4955244..3ce509a 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -66,7 +66,7 @@ rm -f /var/lib/rpm/__db*
# Get proper release naming in the control panel
cat >> /boot/olpc_build << EOF
-Sugar on a Stick 7
+Sugar on a Stick 7 (Quandong)
Fedora release 17 (Beefy Miracle)
EOF
11 years, 10 months
[spin-kickstarts] SoaS: update details
by Peter Robinson
commit 64bdebae13a37a09708e0be44245741fa2dc0087
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Sun May 6 09:35:10 2012 +0100
SoaS: update details
fedora-livecd-soas.ks | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 4955244..1f7e2e3 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -66,8 +66,8 @@ rm -f /var/lib/rpm/__db*
# Get proper release naming in the control panel
cat >> /boot/olpc_build << EOF
-Sugar on a Stick 7
-Fedora release 17 (Beefy Miracle)
+Sugar on a Stick 8
+Fedora release 18 (Spherical Cow)
EOF
cat >> /etc/rc.d/init.d/livesys-late << EOF
11 years, 10 months
[spin-kickstarts/f17] SoaS: update Activities
by Peter Robinson
commit 33e596da80b42be23297ca75e4672f184d618f32
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Sat May 5 14:04:16 2012 +0100
SoaS: update Activities
fedora-livecd-soas.ks | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 6d3deac..4955244 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -99,39 +99,25 @@ cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gsc
active=false
FOE
-# Create a default gnome keyring - should fix RHBZ # 649013
-if [ ! -e /home/liveuser/.gnome2/keyrings/login.keyring ]; then
-mkdir -p /home/liveuser/.gnome2/keyrings
-cat >> /home/liveuser/.gnome2/keyrings/login.keyring << FOE
-[keyring]
-display-name=login
-ctime=1302886515
-mtime=1302886515
-lock-on-idle=false
-lock-timeout=0
-FOE
-
-chown -R liveuser:liveuser /home/liveuser/.gnome2/keyrings
-fi
-
# Add our activities to the favorites
cat > /usr/share/sugar/data/activities.defaults << FOE
-org.laptop.AbiWordActivity
+org.laptop.WebActivity
+org.laptop.HelpActivity
org.laptop.Chat
+org.laptop.sugar.ReadActivity
+org.laptop.sugar.GetBooksActivity
+org.laptop.AbiWordActivity
+org.laptop.TurtleArtActivity
org.laptop.Calculate
org.laptop.Clock
org.laptop.ImageViewerActivity
-org.laptop.Log
org.laptop.Memorize
org.laptop.physics
org.laptop.Pippy
org.laptop.RecordActivity
-org.laptop.Terminal
-org.laptop.TurtleArtActivity
-org.laptop.WebActivity
+org.laptop.Oficina
org.laptop.community.TypingTurtle
org.laptop.sugar.Jukebox
-org.laptop.sugar.ReadActivity
org.gnome.Labyrinth
com.laptop.Ruler
org.sugarlabs.AbacusActivity
@@ -145,6 +131,9 @@ mulawa.Countries
tv.alterna.Clock
vu.lux.olpc.Maze
vu.lux.olpc.Speak
+org.laptop.community.Finance
+org.laptop.Terminal
+org.laptop.Log
FOE
# rebuild schema cache with any overrides we installed
11 years, 11 months
[spin-kickstarts] SoaS: update Activities
by Peter Robinson
commit 3b4b23ddc7112141be4a146b8a86a5ec8a894f5d
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Sat May 5 14:04:16 2012 +0100
SoaS: update Activities
fedora-livecd-soas.ks | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 6d3deac..4955244 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -99,39 +99,25 @@ cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gsc
active=false
FOE
-# Create a default gnome keyring - should fix RHBZ # 649013
-if [ ! -e /home/liveuser/.gnome2/keyrings/login.keyring ]; then
-mkdir -p /home/liveuser/.gnome2/keyrings
-cat >> /home/liveuser/.gnome2/keyrings/login.keyring << FOE
-[keyring]
-display-name=login
-ctime=1302886515
-mtime=1302886515
-lock-on-idle=false
-lock-timeout=0
-FOE
-
-chown -R liveuser:liveuser /home/liveuser/.gnome2/keyrings
-fi
-
# Add our activities to the favorites
cat > /usr/share/sugar/data/activities.defaults << FOE
-org.laptop.AbiWordActivity
+org.laptop.WebActivity
+org.laptop.HelpActivity
org.laptop.Chat
+org.laptop.sugar.ReadActivity
+org.laptop.sugar.GetBooksActivity
+org.laptop.AbiWordActivity
+org.laptop.TurtleArtActivity
org.laptop.Calculate
org.laptop.Clock
org.laptop.ImageViewerActivity
-org.laptop.Log
org.laptop.Memorize
org.laptop.physics
org.laptop.Pippy
org.laptop.RecordActivity
-org.laptop.Terminal
-org.laptop.TurtleArtActivity
-org.laptop.WebActivity
+org.laptop.Oficina
org.laptop.community.TypingTurtle
org.laptop.sugar.Jukebox
-org.laptop.sugar.ReadActivity
org.gnome.Labyrinth
com.laptop.Ruler
org.sugarlabs.AbacusActivity
@@ -145,6 +131,9 @@ mulawa.Countries
tv.alterna.Clock
vu.lux.olpc.Maze
vu.lux.olpc.Speak
+org.laptop.community.Finance
+org.laptop.Terminal
+org.laptop.Log
FOE
# rebuild schema cache with any overrides we installed
11 years, 11 months
[spin-kickstarts/f17] Desktop: Show a 'try-or-install?' window at live media log in
by Kalev Lember
commit c55e8adefffdc7ef0ed1cc739832d3251483ae1e
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Fri May 4 21:21:32 2012 +0300
Desktop: Show a 'try-or-install?' window at live media log in
The live media install notification was reimplemented as an actual
window and the code is now in the Anaconda tree. Use this instead of the
copy-pasted notification code that was in the kickstart file.
fedora-live-desktop.ks | 89 ++++--------------------------------------------
1 files changed, 7 insertions(+), 82 deletions(-)
---
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index 8184d47..df29467 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -57,88 +57,13 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
favorite-apps=['firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop', 'anaconda.desktop']
FOE
- cat > /usr/bin/anaconda-notification << FOE
-#!/usr/bin/env python
-
-from gi.repository import GLib
-from gi.repository import Gio
-from gi.repository import Notify
-import sys
-import os
-import time
-
-def install_cb(n, action, data):
- assert action == "install"
- n.close()
- os.execlp("liveinst", "liveinst")
-
-def closed_cb(user_data):
- sys.exit()
-
-def get_anaconda_desktop_file():
- desktop_files = ['/usr/share/applications/anaconda.desktop',
- '/usr/share/applications/liveinst.desktop']
-
- for f in desktop_files:
- if os.path.isfile(f):
- return f
-
- return ""
-
-def show_notification(n):
- # Spin 10 seconds, waiting for the notification service to start
- retval = False
- for i in range(1, 10):
- try:
- retval = n.show()
- break
- except:
- time.sleep(1)
-
- return retval
-
-if __name__ == '__main__':
- appinfo = Gio.DesktopAppInfo()
- try:
- desktop = appinfo.new_from_filename(get_anaconda_desktop_file())
- except:
- sys.exit(1)
- label = desktop.get_name()
- actionlabel = desktop.get_generic_name()
-
- if not Notify.init(label):
- sys.exit(1)
-
- n = Notify.Notification()
- n.set_property("summary",label)
- n.set_property("body",
- "You are currently using an uninstalled live image.\n" +
- "If you want to keep using Fedora, you can install " +
- "it to your hard disk.")
- n.set_property("icon-name","anaconda")
- n.set_urgency(Notify.Urgency.CRITICAL)
-
- n.connect("closed", closed_cb)
- n.add_action("install", actionlabel, install_cb, None, None)
-
- if not show_notification(n):
- print "Failed to send notification"
- sys.exit(1)
-
- GLib.MainLoop().run()
-FOE
- chmod +x /usr/bin/anaconda-notification
-
- mkdir -p ~liveuser/.config/autostart
- cat > ~liveuser/.config/autostart/anaconda-notification.desktop << FOE
-[Desktop Entry]
-Name=Fedora Install Notification
-Exec=anaconda-notification
-Type=Application
-X-GNOME-Autostart-enabled=true
-FOE
-
- chown -R liveuser:liveuser /home/liveuser/.config/
+ # Make the welcome screen show up
+ if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then
+ mkdir -p ~liveuser/.config/autostart
+ cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
+ cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
+ chown -R liveuser:liveuser /home/liveuser/.config/
+ fi
fi
# rebuild schema cache with any overrides we installed
11 years, 11 months
[spin-kickstarts] Desktop: Show a 'try-or-install?' window at live media log in
by Kalev Lember
commit d7e18ed13b5bef2caf07cc86c58bc1242f5b4b7b
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Fri May 4 21:21:32 2012 +0300
Desktop: Show a 'try-or-install?' window at live media log in
The live media install notification was reimplemented as an actual
window and the code is now in the Anaconda tree. Use this instead of the
copy-pasted notification code that was in the kickstart file.
fedora-live-desktop.ks | 89 ++++--------------------------------------------
1 files changed, 7 insertions(+), 82 deletions(-)
---
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index 8184d47..df29467 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -57,88 +57,13 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
favorite-apps=['firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop', 'anaconda.desktop']
FOE
- cat > /usr/bin/anaconda-notification << FOE
-#!/usr/bin/env python
-
-from gi.repository import GLib
-from gi.repository import Gio
-from gi.repository import Notify
-import sys
-import os
-import time
-
-def install_cb(n, action, data):
- assert action == "install"
- n.close()
- os.execlp("liveinst", "liveinst")
-
-def closed_cb(user_data):
- sys.exit()
-
-def get_anaconda_desktop_file():
- desktop_files = ['/usr/share/applications/anaconda.desktop',
- '/usr/share/applications/liveinst.desktop']
-
- for f in desktop_files:
- if os.path.isfile(f):
- return f
-
- return ""
-
-def show_notification(n):
- # Spin 10 seconds, waiting for the notification service to start
- retval = False
- for i in range(1, 10):
- try:
- retval = n.show()
- break
- except:
- time.sleep(1)
-
- return retval
-
-if __name__ == '__main__':
- appinfo = Gio.DesktopAppInfo()
- try:
- desktop = appinfo.new_from_filename(get_anaconda_desktop_file())
- except:
- sys.exit(1)
- label = desktop.get_name()
- actionlabel = desktop.get_generic_name()
-
- if not Notify.init(label):
- sys.exit(1)
-
- n = Notify.Notification()
- n.set_property("summary",label)
- n.set_property("body",
- "You are currently using an uninstalled live image.\n" +
- "If you want to keep using Fedora, you can install " +
- "it to your hard disk.")
- n.set_property("icon-name","anaconda")
- n.set_urgency(Notify.Urgency.CRITICAL)
-
- n.connect("closed", closed_cb)
- n.add_action("install", actionlabel, install_cb, None, None)
-
- if not show_notification(n):
- print "Failed to send notification"
- sys.exit(1)
-
- GLib.MainLoop().run()
-FOE
- chmod +x /usr/bin/anaconda-notification
-
- mkdir -p ~liveuser/.config/autostart
- cat > ~liveuser/.config/autostart/anaconda-notification.desktop << FOE
-[Desktop Entry]
-Name=Fedora Install Notification
-Exec=anaconda-notification
-Type=Application
-X-GNOME-Autostart-enabled=true
-FOE
-
- chown -R liveuser:liveuser /home/liveuser/.config/
+ # Make the welcome screen show up
+ if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then
+ mkdir -p ~liveuser/.config/autostart
+ cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
+ cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
+ chown -R liveuser:liveuser /home/liveuser/.config/
+ fi
fi
# rebuild schema cache with any overrides we installed
11 years, 11 months