From 5da42d985f5bc84029fed3fc8cd9e53197dc00d6 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 25 Nov 2017 21:09:10 +0000 Subject: Remove obsolete files. We build hybrid ISOs, so don't need separate USB images. Various other files are no longer used amywhere. --- files/GUADEC-booklet.desktop | 6 ----- files/desktop-directories-liveusb-rw | 37 ---------------------------- files/draklive-install.desktop | 38 ----------------------------- files/draklive-install.usb | 1 - files/finish-install.CD | 7 ------ files/finish-install.usb | 6 ----- files/halt.local.DVD | 24 ------------------ files/interfaces | 12 --------- files/live.modprobe.DVD | 1 - files/portable-directories-flash-liveusb-rw | 22 ----------------- files/register.desktop | 27 -------------------- files/xdg-email-hook.sh | 4 --- 12 files changed, 185 deletions(-) delete mode 100644 files/GUADEC-booklet.desktop delete mode 100755 files/desktop-directories-liveusb-rw delete mode 100755 files/draklive-install.desktop delete mode 100644 files/draklive-install.usb delete mode 100644 files/finish-install.CD delete mode 100644 files/finish-install.usb delete mode 100755 files/halt.local.DVD delete mode 100644 files/interfaces delete mode 100644 files/live.modprobe.DVD delete mode 100755 files/portable-directories-flash-liveusb-rw delete mode 100755 files/register.desktop delete mode 100755 files/xdg-email-hook.sh (limited to 'files') diff --git a/files/GUADEC-booklet.desktop b/files/GUADEC-booklet.desktop deleted file mode 100644 index ca2492e..0000000 --- a/files/GUADEC-booklet.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Icon=distributor-logo -Encoding=UTF-8 -Name=GUADEC Booklet -Type=Link -URL=http://assets.expectnation.com/9/eventprovider/9/booklet.pdf diff --git a/files/desktop-directories-liveusb-rw b/files/desktop-directories-liveusb-rw deleted file mode 100755 index 3fd7635..0000000 --- a/files/desktop-directories-liveusb-rw +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -LIVEUSB_LOCK="$HOME/.liveusb-folders" -LIVEUSB_ROOT=/live/media -[ -e "$LIVEUSB_ROOT/My Documents" ] && LIVEUSB_ALA_WINDOWS=1 - -[ -e $LIVEUSB_LOCK ] && exit - -while pidof -x xdg-user-dirs-update; do - [ "$SECONDS" -le 60 ] || return - sleep 1 -done - -function create_link() { - NAME=$1 - SRC=$2 - [ -z "$SRC" ] && SRC=$($NAME) - XDG_DIR=$(xdg-user-dir $NAME) - LIVEUSB_DIR="$LIVEUSB_ROOT/$SRC" - mkdir -p "$LIVEUSB_DIR" - mv $XDG_DIR/{.??,}* "$LIVEUSB_DIR" - rmdir $XDG_DIR && ln -sf "$LIVEUSB_DIR" "$XDG_DIR" -} - -if [ -n "$LIVEUSB_ALA_WINDOWS" ]; then - create_link "DOCUMENTS" "My Documents" - create_link "DOWNLOAD" "My Documents/My Downloads" - create_link "MUSIC" "My Documents/My Music" - create_link "PICTURES" "My Documents/My Images" - create_link "VIDEOS" "My Documents/My Video" -else - for d in DOWNLOAD DOCUMENTS MUSIC PICTURES VIDEOS; do - create_link $d $(echo $d | tr A-Z a-z) - done -fi - -touch $LIVEUSB_LOCK diff --git a/files/draklive-install.desktop b/files/draklive-install.desktop deleted file mode 100755 index 7671a60..0000000 --- a/files/draklive-install.desktop +++ /dev/null @@ -1,38 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=/usr/bin/draklive-install-lock-storage -Icon=draklive-install -Terminal=false -Type=Application -StartupNotify=true -Name=Install on Hard Disk -Name[ar]=التنصيب إلى القرص الصلب -Name[br]=Staliañ war ar bladenn kalet -Name[ca]=Instal·la al Disc Dur -Name[cs]=Instalace na pevný disk -Name[da]=Installér på harddisk -Name[de]=Auf die Festplatte installieren -Name[el]=Εγκατάσταση στο σκληρό δίσκο -Name[es]=Instalar en el Disco Duro -Name[et]=Paigaldamine kõvakettale -Name[eu]=Instalatu disko zurrunean -Name[fi]=Asenna kiintolevylle -Name[fr]=Installer sur disque dur -Name[hu]=Telepítés a merevlemezre -Name[id]=Install ke Hard Disk -Name[it]=Installa sul disco fisso -Name[ky]=Катуу дискке орнотуу -Name[nb]=Installer på harddisk -Name[nl]=Installeer op de harde schijf -Name[nn]=Installer på harddisken -Name[pl]=Zainstaluj na dysku twardym -Name[pt]=Instalar no Disco Rígido -Name[pt_BR]=Instalar no Disco Rígido -Name[ro]=Instalare pe discul dur -Name[ru]=Установка на жесткий диск -Name[sl]=Namestitev na trdi disk -Name[sv]=Installera på hårddisk -Name[tr]=Sabit diske kur -Name[uk]=Встановити на жорсткий диск -Name[zh_CN]=安装到硬盘 -Name[zh_TW]=安裝在硬碟上 diff --git a/files/draklive-install.usb b/files/draklive-install.usb deleted file mode 100644 index fbfa41c..0000000 --- a/files/draklive-install.usb +++ /dev/null @@ -1 +0,0 @@ -SOURCE=/live/source diff --git a/files/finish-install.CD b/files/finish-install.CD deleted file mode 100644 index fed1dd5..0000000 --- a/files/finish-install.CD +++ /dev/null @@ -1,7 +0,0 @@ -FINISH_INSTALL=yes -NETWORK=no -URPMI=no -AUTHENTICATION=no -USERS=no -TIMEZONE=simplified -COUNTRY=simplified diff --git a/files/finish-install.usb b/files/finish-install.usb deleted file mode 100644 index 467f1ac..0000000 --- a/files/finish-install.usb +++ /dev/null @@ -1,6 +0,0 @@ -FINISH_INSTALL=yes -USERS=with_root -AUTHENTICATION=no -USER_AUTOLOGIN_FIRST=yes -TIMEZONE=simplified -COUNTRY=simplified diff --git a/files/halt.local.DVD b/files/halt.local.DVD deleted file mode 100755 index e27ad1d..0000000 --- a/files/halt.local.DVD +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/perl - -use lib qw(/usr/lib/libDrakX); -use MDK::Common; -use detect_devices; -use c; - -my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/live/media\s+iso9660!; -$device or exit; - -# try to put halt/reboot in cache, if not called directly from them -# mount is also needed by end of /etc/init.d/halt -system("$_ --help &>/dev/null") foreach qw(halt mount reboot); - -my $f = detect_devices::tryOpen($device); -# see openCdromTray() from install::any -ioctl($f, c::CDROM_LOCKDOOR(), 0); # unlock door -ioctl($f, c::CDROMEJECT(), 0); - -system("clear"); -print "\n\n\nPlease press (or ) once the medium is removed.\n"; -system("read < /dev/console"); - -ioctl($f, c::CDROMCLOSETRAY(), 0); diff --git a/files/interfaces b/files/interfaces deleted file mode 100644 index 6d2f918..0000000 --- a/files/interfaces +++ /dev/null @@ -1,12 +0,0 @@ -# -# Shorewall6 version 4 - Interfaces File -# -# For information about entries in this file, type "man shorewall6-interfaces" -# -# The manpage is also online at -# http://www.shorewall.net/manpages6/shorewall6-interfaces.html -# -############################################################################### -?FORMAT 2 -############################################################################### -#ZONE INTERFACE OPTIONS diff --git a/files/live.modprobe.DVD b/files/live.modprobe.DVD deleted file mode 100644 index 5bb2345..0000000 --- a/files/live.modprobe.DVD +++ /dev/null @@ -1 +0,0 @@ -install usblp /bin/true diff --git a/files/portable-directories-flash-liveusb-rw b/files/portable-directories-flash-liveusb-rw deleted file mode 100755 index dbdda92..0000000 --- a/files/portable-directories-flash-liveusb-rw +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -function create_mozilla_profile() { - USER_DIR=$1 - PORTABLE_DIR=$2 - [ -d $USER_DIR ] && return - mkdir -p $USER_DIR - ln -sf "$PORTABLE_DIR/Data/profile" $USER_DIR - cat > "$USER_DIR/profiles.ini" < /dev/null` -[ -z "$MAILER" ] && MAILER=/usr/bin/xdg-email -exec $MAILER $@ -- cgit v1.2.1 From 88f285ecc555ba90c33a1137a6a5fa1fa8d9ffa4 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 26 Nov 2017 00:07:46 +0000 Subject: Minimise differences with default Mageia/GNOME configuration. Modify rather than overwrite glib2-branding.gschema.override. Remove obsolete register.desktop from favourites. --- .../01_gsettings-desktop-schemas.gschema.override | 5 -- files/glib2-branding.gschema.override | 73 ---------------------- files/live.gschema.override | 5 ++ 3 files changed, 5 insertions(+), 78 deletions(-) delete mode 100644 files/01_gsettings-desktop-schemas.gschema.override delete mode 100644 files/glib2-branding.gschema.override create mode 100644 files/live.gschema.override (limited to 'files') diff --git a/files/01_gsettings-desktop-schemas.gschema.override b/files/01_gsettings-desktop-schemas.gschema.override deleted file mode 100644 index 5702350..0000000 --- a/files/01_gsettings-desktop-schemas.gschema.override +++ /dev/null @@ -1,5 +0,0 @@ -[org.gnome.shell] -favorite-apps = [ 'mageia-draklive-install.desktop', 'register.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop'] - -[org.gnome.desktop.screensaver] -lock-enabled=false diff --git a/files/glib2-branding.gschema.override b/files/glib2-branding.gschema.override deleted file mode 100644 index b4184eb..0000000 --- a/files/glib2-branding.gschema.override +++ /dev/null @@ -1,73 +0,0 @@ -[org.gnome.desktop.interface] -## No accessibility by default, until we're 100% there's no regression -toolkit-accessibility = false -### For the theme, we stay with the defaults -## Note: for non-GNOME sessions, the cursor theme is defined in /var/adm/fillup-templates/sysconfig.windowmanager-desktop-data-openSUSE from desktop-data-openSUSE -# cursor-theme = "" -## Note: gtk[23]-branding-%{branding_name} must contain the same defaults for icon and gtk, otherwise the theme will change when gnome-settings-daemon starts -# icon-theme = "" -#gtk-theme = "oxygen-gtk" - -[org.gnome.desktop.background] -## Default wallpaper -picture-uri = "file:///usr/share/mga/backgrounds/default.jpg" -picture-options = "stretched" -primary-color = "#258c06" -secondary-color = "#258c06" - -[org.gnome.desktop.screensaver] -## Default wallpaper -picture-uri = "file:///usr/share/mga/backgrounds/default.jpg" -picture-options = "stretched" -primary-color = "#258c06" -secondary-color = "#258c06" - -[org.gnome.login-screen] -## Logo in the gdm login dialog -# logo='/usr/share/icons/hicolor/scalable/apps/distributor.svg' - -[org.gnome.libgnomekbd.desktop] -## Set keyboard layout global per session instead of per window -#group-per-window = false - -[org.gnome.desktop.sound] -## Make sure to have event sounds by default -event-sounds = true - -[org.gnome.desktop.wm.preferences] -## Audible bell is more annoying than useful -audible-bell = false -### For the theme, we stay with the defaults -# titlebar-uses-system-font = false -# titlebar-font = "" -# theme = "" - -[org.gnome.settings-daemon.plugins.xsettings] -## the PackageKit gtk+ module is too spammy, fdo#23917 -disabled-gtk-modules = [ "pk-gtk-module" ] - -[org.gnome.settings-daemon.plugins.media-keys] -help = "XF86Help" - -[org.gnome.shell] -## Default apps shown in the gnome-shell dash -favorite-apps = [ 'mageia-draklive-install.desktop', 'register.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'mageia-drakconf.desktop' ] -## Default extensions that are enabled -#enabled-extensions = [ 'alternative-status-menu@gnome-shell-extensions.gnome.org' ] - -[org.gnome.gnome-panel.applet.window-list] -## Display all workspaces in the gnome-panel window list applet -#display-all-workspaces = true - -[org.freedesktop.Tracker.Miner.Files] -## Disable indexing on removable media -index-removable-devices = false - -[org.gnome.eog.ui] -## External editor to use when editing image -external-editor = "gimp.desktop" - -# ovitters: disable to avoid longstanding bug causing occasional 100% CPU usage -# in gnome-settings-daemon as well as a blinking numlock -[org.gnome.settings-daemon.peripherals.keyboard] -remember-numlock-state = false diff --git a/files/live.gschema.override b/files/live.gschema.override new file mode 100644 index 0000000..9eefe6c --- /dev/null +++ b/files/live.gschema.override @@ -0,0 +1,5 @@ +[org.gnome.shell] +favorite-apps = [ 'mageia-draklive-install.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop'] + +[org.gnome.desktop.screensaver] +lock-enabled=false -- cgit v1.2.1 From 9035e779ef7f3d3ed009a617326fa8c0017ad1d9 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 26 Nov 2017 00:23:52 +0000 Subject: Remove obsolete disabling of speedboot. --- files/draklive-install.d/remove.d/disable-speedboot | 1 - 1 file changed, 1 deletion(-) delete mode 100644 files/draklive-install.d/remove.d/disable-speedboot (limited to 'files') diff --git a/files/draklive-install.d/remove.d/disable-speedboot b/files/draklive-install.d/remove.d/disable-speedboot deleted file mode 100644 index 7bc22d6..0000000 --- a/files/draklive-install.d/remove.d/disable-speedboot +++ /dev/null @@ -1 +0,0 @@ -/var/lib/speedboot/status -- cgit v1.2.1 From 13cc2c8f810bc74e09bbde788df71b9cff091727 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 26 Nov 2017 00:40:55 +0000 Subject: Remove more obsolete configuration values. Mostly stuff that used to be needed when we had separate USB media, plus a few lines that had been commented out rather than deleted. --- files/draklive-install.d/draklive-resize | 1 - 1 file changed, 1 deletion(-) delete mode 100644 files/draklive-install.d/draklive-resize (limited to 'files') diff --git a/files/draklive-install.d/draklive-resize b/files/draklive-install.d/draklive-resize deleted file mode 100644 index 5d33155..0000000 --- a/files/draklive-install.d/draklive-resize +++ /dev/null @@ -1 +0,0 @@ -DRAKLIVE_RESIZE=no -- cgit v1.2.1 From 6c17619e3da91cfc3e271812a55c23f869ffba62 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 26 Nov 2017 12:31:02 +0000 Subject: More simplification and cleanup, now we just support hybrid ISO media. --- files/finish-install | 7 +++++++ files/finish-install.DVD | 7 ------- files/halt.local | 24 ++++++++++++++++++++++++ files/halt.local.CD | 24 ------------------------ files/live.modprobe | 1 + files/live.modprobe.CD | 1 - 6 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 files/finish-install delete mode 100644 files/finish-install.DVD create mode 100755 files/halt.local delete mode 100755 files/halt.local.CD create mode 100644 files/live.modprobe delete mode 100644 files/live.modprobe.CD (limited to 'files') diff --git a/files/finish-install b/files/finish-install new file mode 100644 index 0000000..fed1dd5 --- /dev/null +++ b/files/finish-install @@ -0,0 +1,7 @@ +FINISH_INSTALL=yes +NETWORK=no +URPMI=no +AUTHENTICATION=no +USERS=no +TIMEZONE=simplified +COUNTRY=simplified diff --git a/files/finish-install.DVD b/files/finish-install.DVD deleted file mode 100644 index fed1dd5..0000000 --- a/files/finish-install.DVD +++ /dev/null @@ -1,7 +0,0 @@ -FINISH_INSTALL=yes -NETWORK=no -URPMI=no -AUTHENTICATION=no -USERS=no -TIMEZONE=simplified -COUNTRY=simplified diff --git a/files/halt.local b/files/halt.local new file mode 100755 index 0000000..e27ad1d --- /dev/null +++ b/files/halt.local @@ -0,0 +1,24 @@ +#!/usr/bin/perl + +use lib qw(/usr/lib/libDrakX); +use MDK::Common; +use detect_devices; +use c; + +my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/live/media\s+iso9660!; +$device or exit; + +# try to put halt/reboot in cache, if not called directly from them +# mount is also needed by end of /etc/init.d/halt +system("$_ --help &>/dev/null") foreach qw(halt mount reboot); + +my $f = detect_devices::tryOpen($device); +# see openCdromTray() from install::any +ioctl($f, c::CDROM_LOCKDOOR(), 0); # unlock door +ioctl($f, c::CDROMEJECT(), 0); + +system("clear"); +print "\n\n\nPlease press (or ) once the medium is removed.\n"; +system("read < /dev/console"); + +ioctl($f, c::CDROMCLOSETRAY(), 0); diff --git a/files/halt.local.CD b/files/halt.local.CD deleted file mode 100755 index e27ad1d..0000000 --- a/files/halt.local.CD +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/perl - -use lib qw(/usr/lib/libDrakX); -use MDK::Common; -use detect_devices; -use c; - -my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/live/media\s+iso9660!; -$device or exit; - -# try to put halt/reboot in cache, if not called directly from them -# mount is also needed by end of /etc/init.d/halt -system("$_ --help &>/dev/null") foreach qw(halt mount reboot); - -my $f = detect_devices::tryOpen($device); -# see openCdromTray() from install::any -ioctl($f, c::CDROM_LOCKDOOR(), 0); # unlock door -ioctl($f, c::CDROMEJECT(), 0); - -system("clear"); -print "\n\n\nPlease press (or ) once the medium is removed.\n"; -system("read < /dev/console"); - -ioctl($f, c::CDROMCLOSETRAY(), 0); diff --git a/files/live.modprobe b/files/live.modprobe new file mode 100644 index 0000000..5bb2345 --- /dev/null +++ b/files/live.modprobe @@ -0,0 +1 @@ +install usblp /bin/true diff --git a/files/live.modprobe.CD b/files/live.modprobe.CD deleted file mode 100644 index 5bb2345..0000000 --- a/files/live.modprobe.CD +++ /dev/null @@ -1 +0,0 @@ -install usblp /bin/true -- cgit v1.2.1 From bf15bffd02290a82cb114330e8ac5527bea3abc8 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Wed, 29 Nov 2017 17:55:39 +0000 Subject: Update configuration to work with draklive2/grub2. --- files/UEFI/EFI/BOOT/bootx64.efi | Bin 802816 -> 0 bytes files/UEFI/EFI/BOOT/fonts/unicode.pf2 | Bin 2560080 -> 0 bytes files/UEFI/EFI/BOOT/grub.cfg | 47 ------------------- .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 | Bin 3602 -> 0 bytes .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 | Bin 4922 -> 0 bytes .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 | Bin 6142 -> 0 bytes .../BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 | Bin 4761 -> 0 bytes .../EFI/BOOT/themes/maggy/grub2-mageia-default.png | Bin 178033 -> 0 bytes files/UEFI/EFI/BOOT/themes/maggy/theme.txt | 50 --------------------- 9 files changed, 97 deletions(-) delete mode 100644 files/UEFI/EFI/BOOT/bootx64.efi delete mode 100755 files/UEFI/EFI/BOOT/fonts/unicode.pf2 delete mode 100644 files/UEFI/EFI/BOOT/grub.cfg delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 delete mode 100644 files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/theme.txt (limited to 'files') diff --git a/files/UEFI/EFI/BOOT/bootx64.efi b/files/UEFI/EFI/BOOT/bootx64.efi deleted file mode 100644 index bb2352c..0000000 Binary files a/files/UEFI/EFI/BOOT/bootx64.efi and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/EFI/BOOT/fonts/unicode.pf2 deleted file mode 100755 index 57b682a..0000000 Binary files a/files/UEFI/EFI/BOOT/fonts/unicode.pf2 and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/grub.cfg b/files/UEFI/EFI/BOOT/grub.cfg deleted file mode 100644 index 529ca74..0000000 --- a/files/UEFI/EFI/BOOT/grub.cfg +++ /dev/null @@ -1,47 +0,0 @@ - -insmod efi_gop -insmod efi_uga -insmod video_bochs -insmod video_cirrus -insmod video_fb - -insmod font -if loadfont ${prefix}/fonts/unicode.pf2 -then - insmod gfxterm - set gfxmode=1024x768,800x600,auto - set gfxpayload=keep - terminal_output gfxterm -fi - -insmod png -set theme=/EFI/BOOT/themes/maggy/theme.txt -export theme -loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 -loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 -loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 -loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 - -set timeout=10 - -search --no-floppy --set=root -l 'VOLUME_LABEL' - -menuentry 'Boot Mageia 6 Live' { - linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=free - initrd /boot/cdrom/initrd.gz -} - -menuentry ' + use non-free video drivers (slower to boot)' { - linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot - initrd /boot/cdrom/initrd.gz -} - -menuentry 'Install Mageia 6 Live' { - linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install xdriver=free - initrd /boot/cdrom/initrd.gz -} - -menuentry ' + use non-free video drivers (slower to boot)' { - linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install nokmsboot - initrd /boot/cdrom/initrd.gz -} diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 deleted file mode 100755 index 2fd329b..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 deleted file mode 100755 index 6e619c9..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 deleted file mode 100755 index 605406f..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 deleted file mode 100755 index 5cb52f4..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png b/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png deleted file mode 100644 index df9c862..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/EFI/BOOT/themes/maggy/theme.txt deleted file mode 100755 index 598612f..0000000 --- a/files/UEFI/EFI/BOOT/themes/maggy/theme.txt +++ /dev/null @@ -1,50 +0,0 @@ -# GRUB gfxmenu theme "maggy". - -title-text: "Mageia 6 UEFI" -title-font: "MageiaLogo Bold 28" -title-color: "white" - -desktop-image: "grub2-mageia-default.png" -terminal-font: "Unknown Regular 16" - -+ boot_menu { - left = 5% - top = 15% - width = 75% - height = 55% - item_font = "MageiaLogo Regular 20" - selected_item_font = "MageiaLogo Bold 20" - color_normal="black/black" - item_color = "#0e1a27" - selected_item_color = "white" - item_height = 24 - item_spacing = 10 -} - -+ progress_bar -{ - id = "__timeout__" - left = 20% - top = 70% - width = 60% - height = 2% - fg_color = "lightskyblue" - bg_color = "dodgerblue" - border_color = "midnightblue" -} - -# Informational message bar. -+ vbox { - left = 10% - top = 84%-35 - width = 50% - height = 35 - + label { - text="Select an item with the arrow keys and press Enter to boot." - font="MageiaLogo Bold 16" color="white" - } - + label { - text="Press 'c' for command line, 'e' to edit." - font="MageiaLogo Bold 16" color="white" - } -} -- cgit v1.2.1 From 52bb40d59aed2dc9777bf3ff20be3a6d9b56e5ca Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 9 Dec 2017 12:07:01 +0000 Subject: live.gschema.override: add drakconf to favourites. --- files/live.gschema.override | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'files') diff --git a/files/live.gschema.override b/files/live.gschema.override index 9eefe6c..a5622b7 100644 --- a/files/live.gschema.override +++ b/files/live.gschema.override @@ -1,5 +1,5 @@ [org.gnome.shell] -favorite-apps = [ 'mageia-draklive-install.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop'] +favorite-apps = [ 'mageia-draklive-install.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'mageia-drakconf.desktop' ] [org.gnome.desktop.screensaver] lock-enabled=false -- cgit v1.2.1 From 6dfba4b638f9f16112824318cc869eb6d8d1a86e Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Tue, 19 Dec 2017 17:28:18 +0000 Subject: Switch to using drakiso version of draklive. - s/$live/$build/ - rename live.cfg to build.cfg - remove some redundant settings and configuration values - use mga6 repository for testing until cauldron stabilises - rename postInstall to final_fixes --- files/mga_rpms/update_media.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'files') diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh index 0d5bddf..f742b66 100755 --- a/files/mga_rpms/update_media.sh +++ b/files/mga_rpms/update_media.sh @@ -1,5 +1,5 @@ -bcdmedia=/home/bcd/build_bcd/pieces/cauldron +bcdmedia=/home/bcd/build_bcd/pieces/6 copy_latest() { -- cgit v1.2.1 From 4f7847f05e437254653dbb89ee1e77edccef26f4 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 23 Dec 2017 20:38:12 +0000 Subject: Move update_media.sh to top level and get repo path from settings.cfg --- files/mga_rpms/update_media.sh | 87 ------------------------------------------ 1 file changed, 87 deletions(-) delete mode 100755 files/mga_rpms/update_media.sh (limited to 'files') diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh deleted file mode 100755 index f742b66..0000000 --- a/files/mga_rpms/update_media.sh +++ /dev/null @@ -1,87 +0,0 @@ - -bcdmedia=/home/bcd/build_bcd/pieces/6 - -copy_latest() -{ - repo=$1 - for arch in i586 x86_64 ; do - if [ $2 = "lib" ] ; then - if [ $arch = "x86_64" ] ; then - name=lib64$3 - else - name=lib$3 - fi - else - name=$2 - fi - if [ $arch = "i586" ] ; then - name=${name/-desktop-/-desktop586-} - fi - path=`ls -1v $bcdmedia/$arch/media/$repo/{release,updates}/$name.rpm 2> /dev/null | tail -1` - if [ -z $path ] ; then - echo "Couldn't find $name for $arch" - exit 1 - else - cp $path $arch/mga_rpms/$repo/ - fi - done -} - -# create dirs if non-existant -mkdir -p {i586,x86_64}/mga_rpms/{core,nonfree}/media_info - -# clean dirs -rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/*.rpm -rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/media_info/* - -# add grub2 -copy_latest core grub2-2* -copy_latest core grub2-efi-2* -copy_latest core grub2-mageia-theme-2* -copy_latest core lib efivar0-* -copy_latest core efibootmgr-* -copy_latest core efivar-* - -# add dkms -copy_latest core dkms-2* -copy_latest core binutils-2* -copy_latest core gcc-5* -copy_latest core gcc-cpp-5* -copy_latest core glibc-devel-* -copy_latest core isl-0* -copy_latest core kernel-desktop-devel-4* -copy_latest core kernel-desktop-devel-latest-4* -copy_latest core kernel-userspace-headers-4* -copy_latest core lib isl15-0* -copy_latest core lib mpc3-1* -copy_latest core lib ncurses-devel-* -copy_latest core libstdc++-devel-* -copy_latest core make-4* - -# add nvidia -copy_latest nonfree dkms-nvidia304-* -copy_latest nonfree dkms-nvidia340-* -copy_latest nonfree dkms-nvidia-current-* -copy_latest nonfree x11-driver-video-nvidia304-* -copy_latest nonfree x11-driver-video-nvidia340-* -copy_latest nonfree x11-driver-video-nvidia-current-* - -# add broadcom-wl -copy_latest nonfree dkms-broadcom-wl-* -copy_latest nonfree broadcom-wl-common-* - -# add broadcom wireless configs -copy_latest core broadcom-bcma-config-* -copy_latest core broadcom-ssb-config-* - -# add repo pubkeys -for arch in i586 x86_64 ; do - cp $bcdmedia/$arch/media/core/release/media_info/pubkey $arch/mga_rpms/core/media_info/ - cp $bcdmedia/$arch/media/nonfree/release/media_info/pubkey $arch/mga_rpms/nonfree/media_info/ -done - -# create hdlists -for arch in i586 x86_64 ; do - genhdlist2 $arch/mga_rpms/core - genhdlist2 $arch/mga_rpms/nonfree -done -- cgit v1.2.1 From c6f1fbe1557b473ff287f24813fd160ade04964f Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 14 Jan 2018 21:53:05 +0000 Subject: No point adding a custom resolv.conf - draklive cleans it. --- files/resolv.conf | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 files/resolv.conf (limited to 'files') diff --git a/files/resolv.conf b/files/resolv.conf deleted file mode 100644 index 1941dae..0000000 --- a/files/resolv.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8) -# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN - -nameserver 8.8.8.8 -nameserver 8.8.4.4 -- cgit v1.2.1 From dc16c1eb290c8642614f25d09972ad0a546123bc Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 4 Mar 2018 20:06:20 +0000 Subject: Remove obsolete package selections, fixes, and workarounds. --- files/compute-i18n-list.pl | 88 ----------------------- files/compute-ooo-dicts.pl | 55 -------------- files/defaultspooler | 1 - files/draklive-install.d/run.d/gdm-permissions.sh | 5 -- files/draksnapshot.sysconfig | 1 - files/kbluetoothrc | 5 -- files/live.modprobe | 1 - 7 files changed, 156 deletions(-) delete mode 100755 files/compute-i18n-list.pl delete mode 100755 files/compute-ooo-dicts.pl delete mode 100644 files/defaultspooler delete mode 100755 files/draklive-install.d/run.d/gdm-permissions.sh delete mode 100644 files/draksnapshot.sysconfig delete mode 100644 files/kbluetoothrc delete mode 100644 files/live.modprobe (limited to 'files') diff --git a/files/compute-i18n-list.pl b/files/compute-i18n-list.pl deleted file mode 100755 index 914585b..0000000 --- a/files/compute-i18n-list.pl +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/perl - -use MDK::Common; -use Getopt::Long; -use lib qw(/usr/lib/libDrakX); -use run_program; - -# alleged i18n packages for french (useful to spot missing requires on locales-fr) -# rpm -qa \*-fr\* --qf '%{name}\n' | perl -n -e '/^(.*)-fr(_.+)?$/ and print "$1\n"' | sort -u -# my @packages = ( -# aspell -# kde-i18n -# locales -# mozilla-firefox -# myspell -# myspell-hyph -# openoffice.org-l10n -# ); - -my ($prefix, $ooo_version); -GetOptions( - "prefix=s" => \$prefix, - "ooo=s" => \$ooo_version, -); - -my @misowned_dirs = qw( -/usr/lib/ooo-${ooo_version} -/usr/lib/ooo-${ooo_version}/help -/usr/share/apps -/usr/share/apps/khangman -/usr/share/apps/khangman/data -/usr/share/apps/ktuberling -/usr/share/apps/ktuberling/sounds -/usr/share/doc/HTML -/usr/share/locale -); - -my @dirs = qw( -/usr/share/man -/usr/share/doc/HTML -); - -my @files = qw( -/usr/lib/ooo-${ooo_version}/share/dict/$L.* -/usr/lib/ooo-${ooo_version}/share/dict/$L_comb.* -/usr/lib/ooo-${ooo_version}/share/dict/hyph_$L.* -/usr/lib/ooo-${ooo_version}/share/dict/th_$L.* -/usr/lib/ooo-${ooo_version}/share/dict/th_$L_v2.* -); - -my %per_locale_files = ( - zh => [ - #- disables anti-aliasing by default - '/etc/fonts/conf.d/99-ttf-arphic-uming-bitmaps.conf' - ], -); - -my @locale_packages = run_program::rooted_get_stdout($prefix, 'rpm', '-qa', 'locales-*', '--qf', '%{name}\n'); -my @locales = sort(map { s/^locales-//; chomp; $_ } @locale_packages); - -sub expand_files { - my ($p, $o_lang) = @_; - $p =~ s/\$L/$o_lang/ if $o_lang; - map { s/^$prefix//; $_ } grep { -e $_ } glob($prefix . $p); -} - -foreach my $l (@locales) { - my @list; - my $locale_pkg = "locales-$l"; - #my $l_pattern = qr/^$l([_.@].+)?$/; - #my @l_packages = map { ("$_-$l", "$_-${l}_*") } @packages; - my @l_packages = chomp_(run_program::rooted_get_stdout($prefix, 'rpm', '-q', '--qf', '%{name}\n', '--whatrequires', $locale_pkg)); - unshift @l_packages, $locale_pkg; - my @list = chomp_(run_program::rooted_get_stdout($prefix, 'rpm', '-ql', @l_packages)); - my @all_locales = map { m!^/usr/share/locale/([^/]+)$! } chomp_(run_program::rooted_get_stdout($prefix, 'rpm', '-ql', $locale_pkg)); - # skip misowned directories such as /usr/share/locale - @list = grep { ! -d $prefix . $_ || member(basename($_), @all_locales) } @list; - #@list = difference2(\@list, \@misowned_dirs); - foreach my $l2 (@all_locales) { - foreach my $d (@dirs) { - my $l_d = $d . '/' . $l2; - push @list, $l_d if -e $prefix . $l_d; - } - push @list, expand_files($_, $l2) foreach @files; - } - push @list, expand_files($_) foreach @{$per_locale_files{$l} || []}; - output_p($prefix . "/root/drakx/i18n-$l.lst", map { "$_\n" } sort(@list)); -} diff --git a/files/compute-ooo-dicts.pl b/files/compute-ooo-dicts.pl deleted file mode 100755 index d9968c5..0000000 --- a/files/compute-ooo-dicts.pl +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/perl - -use MDK::Common; -use Getopt::Long; -use lib qw(/usr/lib/libDrakX); -use run_program; - -my $prefix; -my $check_locale; -GetOptions( - "prefix=s" => \$prefix, - "check-locale" => \$check_locale, -); -my $dictd = $ARGV[0] or die "syntax: $0 [--check-locale] [--prefix ] "; - -my $dictf = "dictionary.lst"; -my $dicts = "dictionary.src"; -my $dictu = "dictionary.unused"; - -my @dictl; -my @unused; - -my @available_langs = map { - /^locales-(\S+)/ ? $1 : (); -} chomp_(run_program::rooted_get_stdout($prefix, 'rpm', '-qa', '--provides', 'locales-*')); - -sub add_dict { - my ($type, $name, $file, $add) = @_; - my ($lang, $country) = $name =~ /^([^_]+)_([^_]+)/; - my ($root_name) = $file =~ /^(.*)\.(.*?)$/; - if (!$check_locale || member($lang, @available_langs)) { - push @dictl, [ $type, $lang, $country, $root_name ] if $add; - } else { - push @unused, "$dictd/$file"; - } -} - -rename("$prefix$dictd/$dictf", "$prefix$dictd/$dicts") if ! -e "$prefix$dictd/$dicts"; -foreach (all("$prefix/$dictd")) { - if (/^hyph_(.+)\.(.*?)$/) { - add_dict('HYPH', $1, $_, $2 eq 'dic'); - } elsif (/^th_(.+)\.(.*?)$/) { - add_dict('THES', $1, $_, $2 eq 'idx'); - } elsif (/^(.+_.+)\.(.*?)$/) { - add_dict('DICT', $1, $_, $2 eq 'dic'); - } -} - -output_p("$prefix$dictd/$dictf", - join('', grep { /^#/ } cat_("$prefix$dictd/$dicts")), - "\n", - map { join(' ', @$_) . "\n" } @dictl, - ); - -output_p("$prefix$dictd/$dictu", map { "$_\n" } @unused); diff --git a/files/defaultspooler b/files/defaultspooler deleted file mode 100644 index 462d36c..0000000 --- a/files/defaultspooler +++ /dev/null @@ -1 +0,0 @@ -cups diff --git a/files/draklive-install.d/run.d/gdm-permissions.sh b/files/draklive-install.d/run.d/gdm-permissions.sh deleted file mode 100755 index 62d37d1..0000000 --- a/files/draklive-install.d/run.d/gdm-permissions.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ -d "/var/lib/gdm" ]; then - /usr/bin/chown -R gdm:gdm /var/lib/gdm -fi diff --git a/files/draksnapshot.sysconfig b/files/draksnapshot.sysconfig deleted file mode 100644 index cca41e8..0000000 --- a/files/draksnapshot.sysconfig +++ /dev/null @@ -1 +0,0 @@ -AUTOSTART=FALSE diff --git a/files/kbluetoothrc b/files/kbluetoothrc deleted file mode 100644 index 2680caa..0000000 --- a/files/kbluetoothrc +++ /dev/null @@ -1,5 +0,0 @@ -[General] -AutoStart=false - -[Notification Messages] -kbluepinLocInfo-usr-lib-kdebluetooth=false diff --git a/files/live.modprobe b/files/live.modprobe deleted file mode 100644 index 5bb2345..0000000 --- a/files/live.modprobe +++ /dev/null @@ -1 +0,0 @@ -install usblp /bin/true -- cgit v1.2.1 From 5d9e6b07bbb7de9fbb706cea05dbdaeff148dd45 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 4 Mar 2018 22:41:28 +0000 Subject: Rationalise and better document the configuration. --- files/blacklist-ide.conf | 2 ++ files/blacklist_ide.conf | 2 -- files/dracut-live.conf | 16 ++++++++++++++++ files/empty.conf | 0 files/live-dracut.conf | 16 ---------------- files/live.51-mageia-resume.conf | 0 files/live.modprobe.conf | 0 7 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 files/blacklist-ide.conf delete mode 100644 files/blacklist_ide.conf create mode 100644 files/dracut-live.conf create mode 100644 files/empty.conf delete mode 100644 files/live-dracut.conf delete mode 100644 files/live.51-mageia-resume.conf delete mode 100644 files/live.modprobe.conf (limited to 'files') diff --git a/files/blacklist-ide.conf b/files/blacklist-ide.conf new file mode 100644 index 0000000..146e357 --- /dev/null +++ b/files/blacklist-ide.conf @@ -0,0 +1,2 @@ +# temp fix for 3395 +blacklist pata_acpi diff --git a/files/blacklist_ide.conf b/files/blacklist_ide.conf deleted file mode 100644 index 146e357..0000000 --- a/files/blacklist_ide.conf +++ /dev/null @@ -1,2 +0,0 @@ -# temp fix for 3395 -blacklist pata_acpi diff --git a/files/dracut-live.conf b/files/dracut-live.conf new file mode 100644 index 0000000..42b3e24 --- /dev/null +++ b/files/dracut-live.conf @@ -0,0 +1,16 @@ +# it is a live, build initrd to boot any hardware +hostonly="no" +# load mga livecd support +add_dracutmodules+=" mgalive " +# block some dracut modules we dont want / use +omit_dracutmodules+=" caps crypt dm dmraid mdraid lvm nfs i18n resume modsign " +# compress initrd with xz +compress_l="xz" +# whitelist only the filesystems needed by live CDs and live USB +filesystems="iso9660 vfat =fs/nls squashfs overlay" +# ensure drm drivers are available early in the boot sequence +add_drivers+=" amdgpu radeon nouveau i915 vboxvideo " +# fibre channel & iSCSI modules are unneeded on live CD/USB and pull 1MB+ of firmware files +omit_drivers+=" qla1280 qla2xxx qla4xxx " +# pata_acpi is not wanted on boot +omit_drivers+=" pata_acpi " diff --git a/files/empty.conf b/files/empty.conf new file mode 100644 index 0000000..e69de29 diff --git a/files/live-dracut.conf b/files/live-dracut.conf deleted file mode 100644 index 42b3e24..0000000 --- a/files/live-dracut.conf +++ /dev/null @@ -1,16 +0,0 @@ -# it is a live, build initrd to boot any hardware -hostonly="no" -# load mga livecd support -add_dracutmodules+=" mgalive " -# block some dracut modules we dont want / use -omit_dracutmodules+=" caps crypt dm dmraid mdraid lvm nfs i18n resume modsign " -# compress initrd with xz -compress_l="xz" -# whitelist only the filesystems needed by live CDs and live USB -filesystems="iso9660 vfat =fs/nls squashfs overlay" -# ensure drm drivers are available early in the boot sequence -add_drivers+=" amdgpu radeon nouveau i915 vboxvideo " -# fibre channel & iSCSI modules are unneeded on live CD/USB and pull 1MB+ of firmware files -omit_drivers+=" qla1280 qla2xxx qla4xxx " -# pata_acpi is not wanted on boot -omit_drivers+=" pata_acpi " diff --git a/files/live.51-mageia-resume.conf b/files/live.51-mageia-resume.conf deleted file mode 100644 index e69de29..0000000 diff --git a/files/live.modprobe.conf b/files/live.modprobe.conf deleted file mode 100644 index e69de29..0000000 -- cgit v1.2.1 From 11dc6c20bc6c2f650eff0fd7654f674376e3ee50 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Mon, 5 Mar 2018 23:32:20 +0000 Subject: Use default_user setting in drakx-finish-install after live install. --- files/draklive-install.d/finish-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'files') diff --git a/files/draklive-install.d/finish-install b/files/draklive-install.d/finish-install index ba93dd9..28fe550 100644 --- a/files/draklive-install.d/finish-install +++ b/files/draklive-install.d/finish-install @@ -8,6 +8,6 @@ NETWORK=yes URPMI=yes AUTHENTICATION=no USERS=with_root -USER_RENAME_FROM=live +USER_RENAME_FROM=DEFAULT_USER USER_AUTOLOGIN_FIRST=no GLX=no -- cgit v1.2.1 From 4f9bd74bfae216130fb36f25b1113971f47d52ef Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Tue, 23 Oct 2018 21:42:24 +0100 Subject: Remove halt-local service - it doesn't work. --- files/halt-local.service | 23 ----------------------- files/halt.local | 24 ------------------------ 2 files changed, 47 deletions(-) delete mode 100644 files/halt-local.service delete mode 100755 files/halt.local (limited to 'files') diff --git a/files/halt-local.service b/files/halt-local.service deleted file mode 100644 index bc7f284..0000000 --- a/files/halt-local.service +++ /dev/null @@ -1,23 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -[Unit] -Description=/sbin/halt.local Compatibility -ConditionFileIsExecutable=/sbin/halt.local -DefaultDependencies=no -After=shutdown.target -Before=final.target - -[Service] -Type=oneshot -ExecStartPre=-/bin/kill -54 1 -ExecStartPre=-/usr/bin/plymouth quit -ExecStartPre=-/usr/bin/chvt 1 -ExecStart=/sbin/halt.local -TimeoutSec=0 -StandardOutput=tty -RemainAfterExit=yes diff --git a/files/halt.local b/files/halt.local deleted file mode 100755 index e27ad1d..0000000 --- a/files/halt.local +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/perl - -use lib qw(/usr/lib/libDrakX); -use MDK::Common; -use detect_devices; -use c; - -my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/live/media\s+iso9660!; -$device or exit; - -# try to put halt/reboot in cache, if not called directly from them -# mount is also needed by end of /etc/init.d/halt -system("$_ --help &>/dev/null") foreach qw(halt mount reboot); - -my $f = detect_devices::tryOpen($device); -# see openCdromTray() from install::any -ioctl($f, c::CDROM_LOCKDOOR(), 0); # unlock door -ioctl($f, c::CDROMEJECT(), 0); - -system("clear"); -print "\n\n\nPlease press (or ) once the medium is removed.\n"; -system("read < /dev/console"); - -ioctl($f, c::CDROMCLOSETRAY(), 0); -- cgit v1.2.1 From 526c61a629947c777cc391896d09f2be03ed03fd Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Tue, 23 Oct 2018 21:45:00 +0100 Subject: Remove control of firstboot wizard - it no longer exists. --- files/draklive-install.d/firstboot | 1 - files/firstboot | 1 - 2 files changed, 2 deletions(-) delete mode 100644 files/draklive-install.d/firstboot delete mode 100644 files/firstboot (limited to 'files') diff --git a/files/draklive-install.d/firstboot b/files/draklive-install.d/firstboot deleted file mode 100644 index a842497..0000000 --- a/files/draklive-install.d/firstboot +++ /dev/null @@ -1 +0,0 @@ -FIRSTBOOT=no diff --git a/files/firstboot b/files/firstboot deleted file mode 100644 index a842497..0000000 --- a/files/firstboot +++ /dev/null @@ -1 +0,0 @@ -FIRSTBOOT=no -- cgit v1.2.1