Browse Source

added comments

master
crims0n 5 years ago
parent
commit
3d87b69f07
  1. 2
      install
  2. 37
      linux-live/minioslib

2
install

@ -7,6 +7,8 @@ set -u # treat unset variable as error
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
PARENT_DIR="$(dirname "$SCRIPT_DIR")" PARENT_DIR="$(dirname "$SCRIPT_DIR")"
ISO_DIR="$(dirname "$SCRIPT_DIR")" ISO_DIR="$(dirname "$SCRIPT_DIR")"
#ISO_DIR=$SCRIPT_DIR/iso
#ISO_DIR=/build/nfs/iso
. $SCRIPT_DIR/linux-live/minioslib || exit 1 . $SCRIPT_DIR/linux-live/minioslib || exit 1
#. $SCRIPT_DIR/linux-live/installlib || exit 1 #. $SCRIPT_DIR/linux-live/installlib || exit 1

37
linux-live/minioslib

@ -18,16 +18,17 @@ function common_variables() {
# log # log
#OUTPUT="/$LIVEKITNAME.log" #OUTPUT="/$LIVEKITNAME.log"
# Эта переменная задаётся в файле ./install # if = "1", creates a second iso with a constant filename
#ISO_DIR=$SCRIPT_DIR/iso # если ="1", создаёт второй iso с постоянным именем файла
#ISO_DIR=/build/nfs/iso
#ISO_DIR="$(dirname "$SCRIPT_DIR")"
BUILD_TEST_ISO="1" BUILD_TEST_ISO="1"
# if = "1", creates a copy of minios-live in chroot /opt
# если ="1", создаёт копию minios-live в chroot /opt
DEV_SYSTEM="1" DEV_SYSTEM="1"
CREATE_BACKUP="1" # if ="1", creates backup in parent folder
# если ="1", создаёт резервную копию в родительской папке
CREATE_BACKUP="0"
DEBIAN_FRONTEND_TYPE="noninteractive" DEBIAN_FRONTEND_TYPE="noninteractive"
#DEBIAN_FRONTEND_TYPE="ncurses" #DEBIAN_FRONTEND_TYPE="ncurses"
@ -568,8 +569,10 @@ function build_iso() {
VER="$SYSTEMNAME $VER" VER="$SYSTEMNAME $VER"
if ! $M -hide-rr-moved -f -r -J -l -V "$VER" -A "$VER" \ if
$B $C $D $E -o $ISO $DIR; then ! $M -hide-rr-moved -f -r -J -l -V "$VER" -A "$VER" \
$B $C $D $E -o $ISO $DIR
then
exit 1 exit 1
fi fi
@ -641,12 +644,12 @@ function hostreq_pkg_list() {
echo -e "${YELLOW}=====> installing required software for host system ...${ENDCOLOUR}" echo -e "${YELLOW}=====> installing required software for host system ...${ENDCOLOUR}"
if [ -f $SCRIPT_DIR/linux-live/pkglists/hostreq.list ]; then if [ -f $SCRIPT_DIR/linux-live/pkglists/hostreq.list ]; then
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD update >>$OUTPUT 2>&1 && $APT_CMD update >>$OUTPUT 2>&1 &&
$APT_CMD install -y \ $APT_CMD install -y \
$(grep -vE "^\s*#" $SCRIPT_DIR/linux-live/pkglists/hostreq.list | tr "\n" " ") >>$OUTPUT 2>&1 $(grep -vE "^\s*#" $SCRIPT_DIR/linux-live/pkglists/hostreq.list | tr "\n" " ") >>$OUTPUT 2>&1
else else
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD update >>$OUTPUT 2>&1 && $APT_CMD update >>$OUTPUT 2>&1 &&
$APT_CMD install -y binutils debootstrap squashfs-tools xorriso grub-pc-bin grub-efi-$DISTRIBUTION_ARCH-bin mtools >>$OUTPUT 2>&1 $APT_CMD install -y binutils debootstrap squashfs-tools xorriso grub-pc-bin grub-efi-$DISTRIBUTION_ARCH-bin mtools >>$OUTPUT 2>&1
fi fi
} }
@ -659,7 +662,7 @@ function prereq_pkg_list() {
$APT_CMD upgrade $APT_OPTIONS >>$OUTPUT 2>&1 && $APT_CMD upgrade $APT_OPTIONS >>$OUTPUT 2>&1 &&
echo -e "${YELLOW}=====> installing packages ...${ENDCOLOUR}" && echo -e "${YELLOW}=====> installing packages ...${ENDCOLOUR}" &&
$APT_CMD install $APT_OPTIONS \ $APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/prereq.list | tr "\n" " ") >>$OUTPUT 2>&1 $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/prereq.list | tr "\n" " ") >>$OUTPUT 2>&1
else else
# we need to install systemd first, to configure machine id # we need to install systemd first, to configure machine id
$APT_CMD update >>$OUTPUT 2>&1 && $APT_CMD update >>$OUTPUT 2>&1 &&
@ -674,12 +677,12 @@ function main_pkg_list() {
echo -e "${YELLOW}=====> installing main packages for chroot system ...${ENDCOLOUR}" echo -e "${YELLOW}=====> installing main packages for chroot system ...${ENDCOLOUR}"
if [ -f $SCRIPT_DIR/pkglists/hostreq.list ]; then if [ -f $SCRIPT_DIR/pkglists/hostreq.list ]; then
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD update >>$OUTPUT 2>&1 && $APT_CMD update >>$OUTPUT 2>&1 &&
$APT_CMD install $APT_OPTIONS \ $APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/main.list | tr "\n" " ") >>$OUTPUT 2>&1 $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/main.list | tr "\n" " ") >>$OUTPUT 2>&1
else else
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD update >>$OUTPUT 2>&1 && $APT_CMD update >>$OUTPUT 2>&1 &&
$APT_CMD install $APT_OPTIONS ubuntu-minimal resolvconf xz-utils linux-image-generic >>$OUTPUT 2>&1 $APT_CMD install $APT_OPTIONS ubuntu-minimal resolvconf xz-utils linux-image-generic >>$OUTPUT 2>&1
fi fi
} }
@ -688,9 +691,9 @@ function other_pkg_list() {
echo -e "${YELLOW}=====> installing other packages for chroot system ...${ENDCOLOUR}" echo -e "${YELLOW}=====> installing other packages for chroot system ...${ENDCOLOUR}"
if [ -f $SCRIPT_DIR/pkglists/hostreq.list ]; then if [ -f $SCRIPT_DIR/pkglists/hostreq.list ]; then
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD update >>$OUTPUT 2>&1 && $APT_CMD update >>$OUTPUT 2>&1 &&
$APT_CMD install $APT_OPTIONS \ $APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/other.list | tr "\n" " ") >>$OUTPUT 2>&1 $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/other.list | tr "\n" " ") >>$OUTPUT 2>&1
fi fi
} }

Loading…
Cancel
Save