summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-11-25 21:09:10 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2017-11-25 21:09:10 +0000
commit5da42d985f5bc84029fed3fc8cd9e53197dc00d6 (patch)
tree5b1763d00ee7dbc114d3b142bc69ce718551aa81
parenta035045c7a2472ac12044547563d6f0bcf09ffc4 (diff)
downloaddraklive-config-5da42d985f5bc84029fed3fc8cd9e53197dc00d6.tar
draklive-config-5da42d985f5bc84029fed3fc8cd9e53197dc00d6.tar.gz
draklive-config-5da42d985f5bc84029fed3fc8cd9e53197dc00d6.tar.bz2
draklive-config-5da42d985f5bc84029fed3fc8cd9e53197dc00d6.tar.xz
draklive-config-5da42d985f5bc84029fed3fc8cd9e53197dc00d6.zip
Remove obsolete files.
We build hybrid ISOs, so don't need separate USB images. Various other files are no longer used amywhere.
-rw-r--r--config/settings-liveusb-rw-GUADEC.cfg12
-rw-r--r--config/settings-liveusb-rw.cfg13
-rw-r--r--files/GUADEC-booklet.desktop6
-rwxr-xr-xfiles/desktop-directories-liveusb-rw37
-rwxr-xr-xfiles/draklive-install.desktop38
-rw-r--r--files/draklive-install.usb1
-rw-r--r--files/finish-install.CD7
-rw-r--r--files/finish-install.usb6
-rwxr-xr-xfiles/halt.local.DVD24
-rw-r--r--files/interfaces12
-rw-r--r--files/live.modprobe.DVD1
-rwxr-xr-xfiles/portable-directories-flash-liveusb-rw22
-rwxr-xr-xfiles/register.desktop27
-rwxr-xr-xfiles/xdg-email-hook.sh4
14 files changed, 0 insertions, 210 deletions
diff --git a/config/settings-liveusb-rw-GUADEC.cfg b/config/settings-liveusb-rw-GUADEC.cfg
deleted file mode 100644
index 11a38d1..0000000
--- a/config/settings-liveusb-rw-GUADEC.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-repository=/mnt/BIG/dis/official/2008.1
-additional_repository=http://192.168.100.8/dis/official/2008.1
-arch=i586
-desktop=GNOME
-media=usb
-region=guadec
-pack=
-name=mageia
-product=liveusb-guadec
-version=1
-commercial=0
-default_user=guest
diff --git a/config/settings-liveusb-rw.cfg b/config/settings-liveusb-rw.cfg
deleted file mode 100644
index 20569d8..0000000
--- a/config/settings-liveusb-rw.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-repository=/mnt/BIG/dis/official/2010.0
-updates_repository=
-additional_repository=
-arch=i586
-desktop=KDE4
-media=usb
-region=all
-pack=int
-name=mageia
-product=liveusb
-version=1
-commercial=1
-default_user=
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 <Enter> (or <CTRL><J>) 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" <<EOF
-[General]
-StartWithLastProfile=1
-
-[Profile0]
-Name=default
-IsRelative=1
-Path=profile
-EOF
-}
-
-PORTABLE_ROOT=/live/media/.apps
-create_mozilla_profile "$HOME/.mozilla/firefox" "$PORTABLE_ROOT/FirefoxPortable"
-create_mozilla_profile "$HOME/.thunderbird" "$PORTABLE_ROOT/ThunderbirdPortable"
diff --git a/files/register.desktop b/files/register.desktop
deleted file mode 100755
index de4425d..0000000
--- a/files/register.desktop
+++ /dev/null
@@ -1,27 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Icon=register-mga
-Name=Join Mageia Community
-Name[br]=Mont davet kumuniezh Mageia
-Name[de]=Trete in die Mageia-Community ein
-Name[el]=Συμμετοχή στην κοινότητα της Mageia
-Name[et]=Mageia kogukond
-Name[fi]=Liity Mageia-yhteisöön
-Name[fr]=Rejoignez la communauté Mageia
-Name[id]=Bergabung dengan Komunitas Mageia
-Name[it]=Unisciti alla comunità Mageia
-Name[nl]=Mageia-community
-GenericName[nl]=Mageia-community
-Comment[nl]=Doe mee met de Mageia-community
-Name[sl]=Pridružite se skupnosti Mageia
-Name[sv]=Gå med i Mageia Communityn
-Name[tr]=Mageia Topluluğuna Katılın
-Name[uk]=Спільнота Mageia
-GenericName[uk]=Спільнота Mageia
-Comment[uk]=Приєднатися до спільноти Mageia
-Name[zh_CN]=加入 Mageia 社区
-Name[ru]=Сообщество Mageia
-GenericName[ru]=Сообщество Mageia
-Comment[ru]=Присоединиться к сообществу Mageia
-Type=Link
-URL=http://mageia.org/contribute
diff --git a/files/xdg-email-hook.sh b/files/xdg-email-hook.sh
deleted file mode 100755
index 254ba27..0000000
--- a/files/xdg-email-hook.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -z "$MAILER" ] && MAILER=`which thunderbird 2> /dev/null`
-[ -z "$MAILER" ] && MAILER=/usr/bin/xdg-email
-exec $MAILER $@