summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lists/gnome4
-rw-r--r--src/lists/gnome-core4
-rw-r--r--src/lists/gnome-full4
-rw-r--r--src/lists/gnustep4
-rw-r--r--src/lists/kde4
-rw-r--r--src/lists/kde-core4
-rw-r--r--src/lists/kde-core-i18n4
-rw-r--r--src/lists/kde-extra4
-rw-r--r--src/lists/kde-extra-i18n4
-rw-r--r--src/lists/kde-full4
-rw-r--r--src/lists/kde-full-i18n4
-rw-r--r--src/lists/kde-i18n4
-rw-r--r--src/lists/minimal2
-rw-r--r--src/lists/minimal-net2
-rw-r--r--src/lists/standard2
-rw-r--r--src/lists/standard-i18n2
-rw-r--r--src/lists/x114
-rw-r--r--src/lists/x11-core4
-rw-r--r--src/lists/xfce4
-rwxr-xr-xsrc/main.sh6
-rw-r--r--src/scripts/02defaults.sh13
-rw-r--r--src/scripts/14chroot.sh3
-rw-r--r--src/scripts/21image.sh17
23 files changed, 57 insertions, 50 deletions
diff --git a/src/lists/gnome b/src/lists/gnome
index fd3fb7633..8474dd5a8 100644
--- a/src/lists/gnome
+++ b/src/lists/gnome
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
@@ -12,4 +12,4 @@ gnome-themes-extras
rhythmbox synaptic
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
diff --git a/src/lists/gnome-core b/src/lists/gnome-core
index 7b65ba9d0..e1a9cacc2 100644
--- a/src/lists/gnome-core
+++ b/src/lists/gnome-core
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome-core - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
@@ -9,4 +9,4 @@ console-common locales
# GNOME Core
gdm gnome-core
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
diff --git a/src/lists/gnome-full b/src/lists/gnome-full
index 72f07d08d..f3d17b553 100644
--- a/src/lists/gnome-full
+++ b/src/lists/gnome-full
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome-full - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
@@ -9,4 +9,4 @@ console-common locales
# GNOME Full
gdm gnome
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
diff --git a/src/lists/gnustep b/src/lists/gnustep
index fb3c88d6c..1c0c841bb 100644
--- a/src/lists/gnustep
+++ b/src/lists/gnustep
@@ -1,13 +1,13 @@
# /usr/share/make-live/lists/x11-core - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
# X11
-wdm x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+wdm x-window-system-core
# GNUstep
gnustep gnumail.app talksoup.app viewpdf.app wmaker gnustep-icons
diff --git a/src/lists/kde b/src/lists/kde
index 9701dac47..2f815105e 100644
--- a/src/lists/kde
+++ b/src/lists/kde
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
@@ -9,4 +9,4 @@ console-common locales
# KDE
kde kdm
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
diff --git a/src/lists/kde-core b/src/lists/kde-core
index 9afe124b9..020f4f4b3 100644
--- a/src/lists/kde-core
+++ b/src/lists/kde-core
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-core - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
@@ -9,4 +9,4 @@ console-common locales
# KDE Core
kde-core kdm
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
diff --git a/src/lists/kde-core-i18n b/src/lists/kde-core-i18n
index e2178a25b..060232823 100644
--- a/src/lists/kde-core-i18n
+++ b/src/lists/kde-core-i18n
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-core-i18n - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
@@ -15,7 +15,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
# KDE Core
kde-core kdm
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
# KDE i18n
kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br
diff --git a/src/lists/kde-extra b/src/lists/kde-extra
index dc512cb84..ca3212c3e 100644
--- a/src/lists/kde-extra
+++ b/src/lists/kde-extra
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-extra - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
@@ -9,7 +9,7 @@ console-common locales
# KDE
kde kdm
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
# KDE Full
koffice
diff --git a/src/lists/kde-extra-i18n b/src/lists/kde-extra-i18n
index cb5fe161e..56b775b78 100644
--- a/src/lists/kde-extra-i18n
+++ b/src/lists/kde-extra-i18n
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-extra-i18n - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
@@ -15,7 +15,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
# KDE
kde kdm
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
# KDE i18n
kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br
diff --git a/src/lists/kde-full b/src/lists/kde-full
index f6051d207..624ff80db 100644
--- a/src/lists/kde-full
+++ b/src/lists/kde-full
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-full - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
@@ -9,7 +9,7 @@ console-common locales
# KDE
kde kdm
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
# KDE Full
koffice
diff --git a/src/lists/kde-full-i18n b/src/lists/kde-full-i18n
index 58d7b913a..aacb425e3 100644
--- a/src/lists/kde-full-i18n
+++ b/src/lists/kde-full-i18n
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-full-i18n - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
@@ -15,7 +15,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
# KDE
kde kdm
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
# KDE i18n
kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br
diff --git a/src/lists/kde-i18n b/src/lists/kde-i18n
index b6129e8ba..a53271937 100644
--- a/src/lists/kde-i18n
+++ b/src/lists/kde-i18n
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-i18n - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
@@ -15,7 +15,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
# KDE
kde kdm
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
# KDE i18n
kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br
diff --git a/src/lists/minimal b/src/lists/minimal
index 63d30a86e..dd812796d 100644
--- a/src/lists/minimal
+++ b/src/lists/minimal
@@ -1,4 +1,4 @@
# /usr/share/make-live/lists/minimal - package list for make-live(1)
# Minimal
-eject vim-tiny sudo
+eject file sudo vim-tiny
diff --git a/src/lists/minimal-net b/src/lists/minimal-net
index fb883c515..0609035ab 100644
--- a/src/lists/minimal-net
+++ b/src/lists/minimal-net
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/minimal-net - package list for make-live(1)
# Minimal
-eject vim-tiny sudo
+eject file sudo vim-tiny
# Network
bind9-host dhcp-client dnsutils ftp ifupdown iptables iputils-ping mtr-tiny
diff --git a/src/lists/standard b/src/lists/standard
index e394b57e0..22a81acff 100644
--- a/src/lists/standard
+++ b/src/lists/standard
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/standard - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
diff --git a/src/lists/standard-i18n b/src/lists/standard-i18n
index 9d1e3fc33..077a1c085 100644
--- a/src/lists/standard-i18n
+++ b/src/lists/standard-i18n
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/standard-i18n - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
diff --git a/src/lists/x11 b/src/lists/x11
index acd3d321d..759ae18d8 100644
--- a/src/lists/x11
+++ b/src/lists/x11
@@ -1,10 +1,10 @@
# /usr/share/make-live/lists/x11 - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
# X11
-xdm x-window-system xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+xdm x-window-system
diff --git a/src/lists/x11-core b/src/lists/x11-core
index ee6b31dce..af33eb0f2 100644
--- a/src/lists/x11-core
+++ b/src/lists/x11-core
@@ -1,10 +1,10 @@
# /usr/share/make-live/lists/x11-core - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
# X11
-xdm x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+xdm x-window-system-core
diff --git a/src/lists/xfce b/src/lists/xfce
index 8b288cfbf..b1f5049c4 100644
--- a/src/lists/xfce
+++ b/src/lists/xfce
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/xfce - package list for make-live(1)
# Minimal
-eject sudo
+eject file sudo vim-tiny
# Standard
console-common locales
@@ -9,4 +9,4 @@ console-common locales
# Xfce
gdm xfce4
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
diff --git a/src/main.sh b/src/main.sh
index 7b3171f83..cfffd8337 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -30,9 +30,9 @@ CONFIG="/etc/make-live.conf"
PROGRAM="`basename ${0}`"
VERSION="0.99.14"
-CODENAME_OLDSTABLE="sarge"
-CODENAME_STABLE="etch"
-CODENAME_TESTING="lenny"
+CODENAME_OLDSTABLE="woody"
+CODENAME_STABLE="sarge"
+CODENAME_TESTING="etch"
CODENAME_UNSTABLE="sid"
# Source sub scripts
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh
index 9cc4c5a21..faca4769d 100644
--- a/src/scripts/02defaults.sh
+++ b/src/scripts/02defaults.sh
@@ -53,7 +53,7 @@ Defaults ()
# Set debian distribution
if [ -z "${LIVE_DISTRIBUTION}" ]
then
- LIVE_DISTRIBUTION="testing"
+ LIVE_DISTRIBUTION="unstable"
fi
if [ "${LIVE_DISTRIBUTION}" = "experimental" ]
@@ -86,7 +86,13 @@ Defaults ()
;;
amd64)
- LIVE_KERNEL="amd64"
+ if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] || \
+ [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ]
+ then
+ LIVE_KERNEL="amd64"
+ else
+ LIVE_KERNEL="amd64-generic"
+ fi
;;
arm)
@@ -99,7 +105,8 @@ Defaults ()
;;
i386)
- if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ]
+ if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ] || \
+ [ "${LIVE_DISTRIBUTION}" = "stable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_STABLE}" ]
then
LIVE_KERNEL="386"
else
diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh
index cc24eecf6..2e2b489f0 100644
--- a/src/scripts/14chroot.sh
+++ b/src/scripts/14chroot.sh
@@ -156,6 +156,9 @@ Chroot ()
Chroot_exec "${LIVE_HOOK}"
fi
+ # Temporary hacks for broken packages
+ Hack_xorg
+
# Add filesystem.manifest
Chroot_exec "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest
diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh
index 5261867ec..36ca014a8 100644
--- a/src/scripts/21image.sh
+++ b/src/scripts/21image.sh
@@ -215,20 +215,17 @@ Syslinux ()
Linuximage ()
{
- # Removing initrd backup files
- rm -f "${LIVE_CHROOT}"/boot/initrd*bak*
-
case "${1}" in
iso)
# Copy linux-image
if [ "${LIVE_FLAVOUR}" = "minimal" ]
then
- mv "${LIVE_CHROOT}"/boot/vmlinuz-* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
- mv "${LIVE_CHROOT}"/boot/initrd.img-* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
+ mv "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
+ mv "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
rm -f "${LIVE_CHROOT}"/vmlinuz "${LIVE_CHROOT}"/initrd.img
else
- cp "${LIVE_CHROOT}"/boot/vmlinuz-* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
- cp "${LIVE_CHROOT}"/boot/initrd.img-* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
+ cp "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
+ cp "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
fi
;;
@@ -236,10 +233,10 @@ Linuximage ()
# Copy linux-image
if [ "${LIVE_FLAVOUR}" = "minimal" ]
then
- mv "${LIVE_ROOT}"/chroot/boot/vmlinuz-* "${LIVE_ROOT}"/tftpboot/vmlinuz
- mv "${LIVE_ROOT}"/chroot/boot/initrd.img-* "${LIVE_ROOT}"/tftpboot/initrd.gz
+ mv "${LIVE_ROOT}"/chroot/boot/vmlinuz* "${LIVE_ROOT}"/tftpboot/vmlinuz
+ mv "${LIVE_ROOT}"/chroot/boot/initrd.img* "${LIVE_ROOT}"/tftpboot/initrd.gz
else
- cp "${LIVE_ROOT}"/chroot/boot/vmlinuz-* "${LIVE_ROOT}"/tftpboot/vmlinuz
+ cp "${LIVE_ROOT}"/chroot/boot/vmlinuz* "${LIVE_ROOT}"/tftpboot/vmlinuz
cp "${LIVE_ROOT}"/chroot/boot/initrd.img-* "${LIVE_ROOT}"/tftpboot/initrd.gz
fi
;;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 15:05:17 +0000