From 57f0e63f35f72ff98c7ea3d28bd7635421c3a687 Mon Sep 17 00:00:00 2001 From: Lars Müller Date: Sun, 21 Jan 2007 22:04:49 +0000 Subject: Add support for Mandrica 2007.0. Mandriva uses urpmi to make the life with RPM easier. Therfore we have to add support for this meta packager too. The initial bootstrap works already. The install of the rpm package spits warni9ngs about missing user and group rpm. As the pre script has the required call to /usr/share/rpm-helper/add-user and the userer and the group are there after the system is bootstraped. This is a minor problem as the ownership falls back to root and all rpm calls run as root at the moment. Unfortunately my local Mandriva mirror doesn't have the media_info sub dirs yet. Therefore I was not able to test if the call to urpmi.addmedia works. This is used to setup the available installation medias. git-svn-id: http://svn.openslx.org/svn/openslx/trunk@636 95ad53e4-c205-0410-b2fa-d234c58c8868 --- installer/slxossetup | 23 ++++++- installer/systems/mandriva2007_0/settings | 77 ++++++++++++++++++++++ .../systems/mandriva2007_0/settings.local.example | 13 ++++ 3 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 installer/systems/mandriva2007_0/settings create mode 100644 installer/systems/mandriva2007_0/settings.local.example diff --git a/installer/slxossetup b/installer/slxossetup index 2a366629..117cf224 100755 --- a/installer/slxossetup +++ b/installer/slxossetup @@ -223,7 +223,7 @@ function setup_bootstrap_1c() test ${rc} -eq 0 || \ ErrorMsg ${rc} "Bootstrap failed! " ;; - *suse*|*fedora*) + *suse*|*fedora*|*mandriva*) test -d "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/etc" || \ mkdir "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/etc" touch "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/etc/mtab" @@ -263,6 +263,8 @@ function setup_bootstrap_1c() function setup_package_sources() { + local SOURCES_LIST URPMI_ADDMEDIA_ARG + case "${SLX_SYSTEM_BASENAME}" in *debian*|*ubuntu*) SOURCES_LIST="${SLX_STAGE1_PATH}/etc/apt/sources.list" @@ -292,6 +294,7 @@ function setup_package_sources() test "${INST_SOURCE_NAME}" || \ INST_SOURCE_NAME="${INST_SOURCE_CHANNEL}" + INST_SOURCE_PACKAGE_SUBDIR=$( eval echo \$SLX_INST_SOURCE_PACKAGE_SUBDIR${INST_SOURCE_CHANNEL}) INST_SOURCE_REPO_SUBDIR=$( eval echo \$SLX_INST_SOURCE_REPO_SUBDIR_${INST_SOURCE_CHANNEL}) INST_SOURCE_TYPE=$( eval echo \$SLX_INST_SOURCE_TYPE_${INST_SOURCE_CHANNEL}) # Use default repo type if not available from settings config file @@ -330,6 +333,17 @@ function setup_package_sources() ${INST_SOURCE_PRIORITY} \ -y ;; + urpmi) + case "${INST_SOURCE_PACKAGE_SUBDIR}" in + */updates) URPMI_ADDMEDIA_ARG="--update" ;; + *) URPMI_ADDMEDIA_ARG="" ;; + esac + eval LC_ALL=POSIX chroot ${SLX_STAGE1_PATH} urpmi.addmedia \ + ${URPMI_ADDMEDIA_ARG} \ + \"${INST_SOURCE_CHANNEL}\" \ + \"${INST_SOURCE_BASEURL}/${INST_SOURCE_PACKAGE_SUBDIR}\" \ + with media_info/hdlist.cz + ;; yum) echo -e "[${INST_SOURCE_CHANNEL}]\nname=${INST_SOURCE_NAME}\nbaseurl=${INST_SOURCE_BASEURL}${INST_SOURCE_REPO_SUBDIR:+/${INST_SOURCE_REPO_SUBDIR}}" \ >${SLX_STAGE1_PATH}/etc/yum.repos.d/${INST_SOURCE_CHANNEL}.repo @@ -449,6 +463,13 @@ function slxossetup() META_PACKAGER="yum" REPO_TYPE="rpm-md" ;; + *mandriva*) + GLOBAL_SETTINGS="PACKAGE_SUBDIR" + test "${SLX_META_PACKAGER}" && \ + META_PACKAGER="${SLX_META_PACKAGER}" || \ + META_PACKAGER="urpmi" + REPO_TYPE="rpm-md" + ;; *debian*|*ubuntu*) GLOBAL_SETTINGS="BASEURL COMPONENTS DISTRIBUTION" test "${SLX_META_PACKAGER}" && \ diff --git a/installer/systems/mandriva2007_0/settings b/installer/systems/mandriva2007_0/settings new file mode 100644 index 00000000..87a6058f --- /dev/null +++ b/installer/systems/mandriva2007_0/settings @@ -0,0 +1,77 @@ +SLX_INST_SOURCE_BASEURL="http://ftp-1.gwdg.de/pub/linux/mandrivalinux/official/2007.0/i586" +SLX_INST_SOURCE_PACKAGE_SUBDIR="media/main/release" +SLX_INST_SOURCE_PACKAGEKEYS=" +" +SLX_INST_SOURCE_NAME_mandriva2007_0="Mandriva 2007.0" +SLX_INST_SOURCE_REPO_SUBDIR_mandriva2007_0="" +SLX_INST_SOURCE_NAME_mandriva2007_0update="Mandriva 2007.0 updates" +SLX_INST_SOURCE_PACKAGE_SUBDIR_mandriva2007_0update="media/main/updates" +SLX_BASE_PREREQ_PACKAGES=" +rpm-4.4.6-10mdv2007.0.i586.rpm +" +SLX_BASE_BOOTSTRAP_PREREQ_PACKAGES=" +libtermcap2-2.0.8-40mdv2007.0.i586.rpm +" +SLX_BASE_BOOTSTRAP_PACKAGES=" +ash-0.3.8-11mdv2007.0.i586.rpm +bash-3.1-7mdv2007.0.i586.rpm +bzip2-1.0.3-6mdv2007.0.i586.rpm +chkconfig-1.3.25-2mdv2007.0.i586.rpm +coreutils-5.97-3mdv2007.0.i586.rpm +cpio-2.6-7mdk.i586.rpm +cracklib-dicts-2.8.9-1mdv2007.0.i586.rpm +e2fsprogs-1.39-2mdv2007.0.i586.rpm +gawk-3.1.5-2mdk.i586.rpm +glibc-2.4-4mdk.i586.rpm +grep-2.5.1a-2mdk.i586.rpm +info-install-4.8-4mdv2007.0.i586.rpm +ldconfig-2.4-4mdk.i586.rpm +libbeecrypt6-3.1.0-7mdk.i586.rpm +libbzip2_1-1.0.3-6mdv2007.0.i586.rpm +libcrack2-2.8.9-1mdv2007.0.i586.rpm +libdb2-2.4.14-15mdk.i586.rpm +libelfutils1-0.120-2mdk.i586.rpm +libext2fs2-1.39-2mdv2007.0.i586.rpm +libgcc1-4.1.1-3mdk.i586.rpm +libkrb53-1.4.3-6mdv2007.0.i586.rpm +libneon0.26-0.26.1-2mdv2007.0.i586.rpm +libopenssl0.9.8-0.9.8b-2mdv2007.0.i586.rpm +libpam0-0.99.6.0-3mdv2007.0.i586.rpm +libpcre0-6.7-1mdv2007.0.i586.rpm +libpopt0-1.10.6-10mdv2007.0.i586.rpm +librpm4.4-4.4.6-10mdv2007.0.i586.rpm +libsqlite3_0-3.3.6-3mdv2007.0.i586.rpm +libstdc++6-4.1.1-3mdk.i586.rpm +libxml2-2.6.26-2mdv2007.0.i586.rpm +mktemp-1.5-13mdk.i586.rpm +openssl-0.9.8b-2mdv2007.0.i586.rpm +pam-0.99.6.0-3mdv2007.0.i586.rpm +perl-base-5.8.8-7mdv2007.0.i586.rpm +popt-data-1.10.6-10mdv2007.0.i586.rpm +rmt-0.4b41-2mdv2007.0.i586.rpm +rootcerts-20060621-2mdv2007.0.noarch.rpm +rpm-helper-0.17-3mdv2007.0.noarch.rpm +rpm-mandriva-setup-1.29-3mdv2007.0.i586.rpm +setup-2.7.3-1mdv2007.0.i586.rpm +shadow-utils-4.0.12-3mdv2007.0.i586.rpm +update-alternatives-1.8.4-2mdv2007.0.noarch.rpm +zlib1-1.2.3-2mdv2007.0.i586.rpm +curl-7.15.5-1mdv2007.0.i586.rpm +eject-2.1.5-2mdv2007.0.i586.rpm +gnupg-1.4.5-1mdv2007.0.i586.rpm +libcurl3-7.15.5-1mdv2007.0.i586.rpm +libgdbm3-1.8.3-3mdv2007.0.i586.rpm +libidn11-0.6.5-1mdv2007.0.i586.rpm +libldap2.3_0-2.3.27-1mdv2007.0.i586.rpm +libreadline5-5.1-1mdk.i586.rpm +libsasl2-2.1.22-20mdv2007.0.i586.rpm +libusb0.1_4-0.1.12-2mdv2007.0.i586.rpm +openldap-2.3.27-1mdv2007.0.i586.rpm +perl-5.8.8-7mdv2007.0.i586.rpm +perl-Config-IniFiles-2.39-1mdk.noarch.rpm +perl-Locale-gettext-1.05-3mdv2007.0.i586.rpm +perl-MDV-Distribconf-3.06-1mdv2007.0.noarch.rpm +perl-MDV-Packdrakeng-1.01-2mdk.noarch.rpm +perl-URPM-1.46-1mdv2007.0.i586.rpm +urpmi-4.8.28-1mdv2007.0.noarch.rpm +" diff --git a/installer/systems/mandriva2007_0/settings.local.example b/installer/systems/mandriva2007_0/settings.local.example new file mode 100644 index 00000000..479f7b0e --- /dev/null +++ b/installer/systems/mandriva2007_0/settings.local.example @@ -0,0 +1,13 @@ +# Settings made here overwrite values from the settings file in the same +# directory. +# It's also possible to define addditional values here. + +# Use a local installation source. +SLX_INST_SOURCE_BASEURL="ftp://gab/pub/mandrivalinux/official/2007.0/i586" + +# Add more packages. +# It's possible to habe more than one SLX_INSTALL_PACKAGES_* variable defined. +# All SLX_INSTALL_PACKAGES_* are combined to one package list which is +# in one step. +#SLX_INSTALL_PACKAGES_EDITORS="vim emacs" +#SLX_INSTALL_PACKAGES_KDEPIM="kdepim3" -- cgit v1.2.3-55-g7522