diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-01 14:07:28 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:09 +0100 |
| commit | 613393eef8be213c8859b2d7a2f6334cb82bd52b (patch) | |
| tree | 519838fe8eb8f4670d3a09e8baf5035e6b55ff73 /scripts | |
| parent | 4be693e68867b58fb0bac1f6fb1b5b153a1eb8bf (diff) | |
| download | live-boot-613393eef8be213c8859b2d7a2f6334cb82bd52b.tar.gz live-boot-613393eef8be213c8859b2d7a2f6334cb82bd52b.zip | |
Merging casper 1.229.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live-bottom/34disable_kde_services | 7 | ||||
| -rwxr-xr-x | scripts/live-bottom/41apt_cdrom | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/scripts/live-bottom/34disable_kde_services b/scripts/live-bottom/34disable_kde_services index 3350d61..41f881c 100755 --- a/scripts/live-bottom/34disable_kde_services +++ b/scripts/live-bottom/34disable_kde_services @@ -26,16 +26,15 @@ log_begin_msg "Disabling unnecessary KDE services..." # live-initramfs script -rm -f /root/usr/share/services/kded/kwalletd.desktop -rm -f /root/usr/share/kde4/services/kwalletd.desktop rm -f /root/usr/share/autostart/kab2kabc.desktop rm -f /root/usr/share/autostart/kabcdistlistupdater.desktop rm -f /root/usr/share/autostart/korgac.desktop rm -f /root/usr/share/autostart/printer-applet.desktop rm -f /root/usr/share/autostart/nepomukserver.desktop +rm -f /root/usr/share/kde4/services/kwalletd.desktop rm -f /root/usr/share/kde4/services/kded/kpackagekitd.desktop -rm -f /root/usr/share/kde4/services/kded/susefreespacenotifier.desktop +rm -f /root/usr/share/kde4/services/kded/freespacenotifier.desktop rm -f /root/usr/share/kde4/services/plasma-runner-contacts.desktop # starts akonadi -rm -f /root/etc/xdg/autostart/update-notifier-kde.desktop +rm -f /root/usr/share/kde4/services/kded/notificationhelper.desktop log_end_msg diff --git a/scripts/live-bottom/41apt_cdrom b/scripts/live-bottom/41apt_cdrom index 0b3f79b..eb7fbd8 100755 --- a/scripts/live-bottom/41apt_cdrom +++ b/scripts/live-bottom/41apt_cdrom @@ -37,7 +37,7 @@ then mount -n -o bind /proc /root/proc mount -n -o bind /dev /root/dev - chroot /root apt-cdrom -m add + chroot /root apt-cdrom -o Acquire::cdrom::AutoDetect=false -m add umount /root/dev umount /root/proc |