diff options
| author | Jybz <j.biernacki@free.fr> | 2020-08-30 01:37:13 +0200 |
|---|---|---|
| committer | Jybz <j.biernacki@free.fr> | 2020-08-30 01:37:13 +0200 |
| commit | f6475aaefaf8439cccbc9f83fe7255454d3c238e (patch) | |
| tree | c2693848903b7f78dd13a2dce645a8917a38c275 | |
| parent | e71c0f3072747f77e455ec14c4ebc0f75d60fcfb (diff) | |
| download | mageia4arm-f6475aaefaf8439cccbc9f83fe7255454d3c238e.tar mageia4arm-f6475aaefaf8439cccbc9f83fe7255454d3c238e.tar.gz mageia4arm-f6475aaefaf8439cccbc9f83fe7255454d3c238e.tar.bz2 mageia4arm-f6475aaefaf8439cccbc9f83fe7255454d3c238e.tar.xz mageia4arm-f6475aaefaf8439cccbc9f83fe7255454d3c238e.zip | |
fix type, shift dnf extra inside dnf mirroir
| -rwxr-xr-x | create_arm_image.sh | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/create_arm_image.sh b/create_arm_image.sh index fc72789..7117387 100755 --- a/create_arm_image.sh +++ b/create_arm_image.sh @@ -153,6 +153,7 @@ function genusemirroroptions() fi fi export DNF_MIRROROPTS + enableextrarepos return 0 } @@ -313,13 +314,13 @@ function preparechroot() echo "${HOSTNAME:="localhost.localdomain"}" > "${BUILD_PATH}/etc/hostname" info "copying second stage script in ${BUILD_PATH}" - #echo "/usr/bin/cp ${CONFIG_PATH}/second_stage_install.sh ${BUILD_PATH}/" + cp --preserve=mode "${CONFIG_PATH}/second_stage_install.sh" "${BUILD_PATH}/second_stage_install.sh" if [ ${?} -ne 0 ]; then error "line ${LINENO} error copying ${CONFIG_PATH}/second_stage_install.sh : exiting" exit ${ERR_1} fi - info "configuring second_install_install.sh for ${INSTALL_METHOD}" + info "configuring second_stage_install.sh for ${INSTALL_METHOD}" if [ ${INSTALL_METHOD} = "urpmi" ]; then sed -i -e "s/<INSTALL_EXEC>/sbin\/urpmi --no-verify-rpm --auto/g" "${BUILD_PATH}/second_stage_install.sh" else @@ -700,9 +701,6 @@ function copyingcommon() function mkfstab() { title "making /etc/fstab" - ### BUG : /mnt/arm_boot is set to vfat for all plateforms, odroid configuration says ext4. - #echo -e "proc /proc proc defaults 0 0\nUUID=${BOOT_UUID} /mnt/arm_boot vfat defaults 0 0\nUUID=${ROOT_UUID} / ext4 defaults 0 0" > "${BUILD_PATH}/etc/fstab" - #echo -e "proc\t/proc\tproc\tdefaults\t0\t0\nUUID=${BOOT_UUID}\t/mnt/arm_boot\t${BOOTFS}\tdefaults\t0\t0\nUUID=${ROOT_UUID}\t/\text4\tdefaults\t0\t0" > "${BUILD_PATH}/etc/fstab" if [ 1 -eq ${SEPARATE_BOOT_PARTITION} ]; then echo -e "proc\t/proc\tproc\tdefaults\t0\t0\nUUID=${BOOT_UUID}\t/mnt/arm_boot\t${BOOTFS}\tdefaults\t0\t0\nUUID=${ROOT_UUID}\t/\text4\tdefaults\t0\t0" > "${BUILD_PATH}/etc/fstab" else @@ -1006,10 +1004,7 @@ fi info "Option: "${OPT} - ### BUG : This lines overright values sourced 40 lines before : " source "${CONFIG_PATH}/mageia4arm.cfg" -# IMAGE="Mageia-${MAGEIA_VERSION}-${TARGET}${TARGET_VERSION}.img" -# BOOT="/mnt/boot" -# ROOT="/mnt/root" + BUILD_PATH="${INSTALL_PATH}/build-${TARGET}${TARGET_VERSION}" # ARM_VERSION="armv7hl" DNF_CONFIGPATH="$(dirname $(realpath "$0"))/mageia4arm-dnf.conf" @@ -1076,7 +1071,6 @@ case ${OPT} in addurpmimedia else genusemirroroptions #Generate mirror options, if needed - enableextrarepos fi installbasesystem #Generate the rootfs, rootfiles, ... mkfstab |