Browse Source

support for hybrid image and ubuntu support

master
crims0n 4 years ago
parent
commit
509416dcda
  1. 16
      README.md
  2. 73
      autoinstall
  3. 3
      docker/01-runme.sh
  4. 7
      docker/02-build.sh
  5. 8
      docker/Dockerfile.py
  6. 4
      install
  7. 19
      linux-live/basesystem/01-core/cloud.list
  8. 59
      linux-live/basesystem/01-core/install
  9. 23
      linux-live/basesystem/01-core/postinstall
  10. 3
      linux-live/basesystem/01-core/rootcopy-install/etc/apt/apt.conf.d/000Slax
  11. 140
      linux-live/basesystem/01-core/rootcopy-install/home/live/.bashrc
  12. 54
      linux-live/basesystem/01-core/rootcopy-install/usr/bin/apt2sb
  13. 1
      linux-live/basesystem/01-core/standard.list
  14. BIN
      linux-live/bootfiles-grub/EFI/boot/bootx64.efi
  15. BIN
      linux-live/bootfiles-grub/EFI/boot/efiboot.img
  16. BIN
      linux-live/bootfiles-grub/EFI/boot/grubx64.efi
  17. BIN
      linux-live/bootfiles-grub/boot/grub/bootlogo.png
  18. 42
      linux-live/bootfiles-grub/boot/grub/grub.cfg
  19. 31
      linux-live/bootfiles-grub/boot/grub/grub.cfg.2
  20. BIN
      linux-live/bootfiles-grub/boot/grub/unicode.pf2
  21. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/acpi.mod
  22. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/adler32.mod
  23. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/ahci.mod
  24. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/all_video.mod
  25. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/aout.mod
  26. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/appleldr.mod
  27. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/archelp.mod
  28. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/at_keyboard.mod
  29. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/ata.mod
  30. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/backtrace.mod
  31. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/bfs.mod
  32. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/bitmap.mod
  33. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/bitmap_scale.mod
  34. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/blocklist.mod
  35. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/boot.mod
  36. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/bsd.mod
  37. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/bswap_test.mod
  38. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/btrfs.mod
  39. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/bufio.mod
  40. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cat.mod
  41. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cbfs.mod
  42. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cbls.mod
  43. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cbmemc.mod
  44. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cbtable.mod
  45. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cbtime.mod
  46. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/chain.mod
  47. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cmdline_cat_test.mod
  48. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cmp.mod
  49. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cmp_test.mod
  50. 190
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/command.lst
  51. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cpio.mod
  52. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cpio_be.mod
  53. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cpuid.mod
  54. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/crc64.mod
  55. 45
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/crypto.lst
  56. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/crypto.mod
  57. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cryptodisk.mod
  58. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/cs5536.mod
  59. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/ctz_test.mod
  60. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/date.mod
  61. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/datehook.mod
  62. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/datetime.mod
  63. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/disk.mod
  64. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/diskfilter.mod
  65. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/div.mod
  66. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/div_test.mod
  67. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/dm_nv.mod
  68. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/echo.mod
  69. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/efi_gop.mod
  70. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/efi_uga.mod
  71. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/efifwsetup.mod
  72. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/efinet.mod
  73. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/ehci.mod
  74. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/elf.mod
  75. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/eval.mod
  76. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/exfat.mod
  77. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/exfctest.mod
  78. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/ext2.mod
  79. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/fat.mod
  80. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/file.mod
  81. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/fixvideo.mod
  82. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/font.mod
  83. 36
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/fs.lst
  84. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_arcfour.mod
  85. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_blowfish.mod
  86. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_camellia.mod
  87. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_cast5.mod
  88. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_crc.mod
  89. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_des.mod
  90. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_dsa.mod
  91. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_idea.mod
  92. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_md4.mod
  93. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_md5.mod
  94. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_rfc2268.mod
  95. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_rijndael.mod
  96. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_rmd160.mod
  97. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_rsa.mod
  98. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_seed.mod
  99. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_serpent.mod
  100. BIN
      linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_sha1.mod

16
README.md

@ -33,18 +33,6 @@
./install build_iso
./install -
**!!!Сборка с помощью докера пока не работает!!!**
Для сборки с помошью докера создайте в домашней папке папку build, поместите туда minios-slax, запустите 01-runme.sh из папки docker. Данное действие установит необходимые программы и создаст образ. Для запуска сборки отредактируйте под себя и запустите 02-build.sh. Пример содержимого файла:
Для сборки с помошью докера создайте в домашней папке папку build, поместите туда скрипты сборки minios и используйте команду для автоматической установки:
`sudo docker run -it --rm --cap-add SYS_ADMIN -v /home/user/build:/build ubuntu:trusty /build/minios/autoinstall -`
либо для установки в ручном режиме:
`sudo docker run -it --rm --cap-add SYS_ADMIN -v /home/user/build:/build ubuntu:trusty /build/minios/install -`
Для использования сборки в специально подготовленном контейнере используйте следующие примеры команд:
`sudo docker run -it --rm --cap-add SYS_ADMIN -v /home/user/build:/build crims0n/minios-container` - пример сборки с выводом информации в консоль
`sudo docker run -d --name=minios-build --cap-add SYS_ADMIN -v /home/user/build:/build crims0n/minios-container` - пример сборки в фоне без удаления контейнера по окончании сборки
`docker run --rm -it --name mlc --privileged -v /home/user/build:/build local/mlc`

73
autoinstall

@ -1,73 +0,0 @@
#!/bin/bash
set -e # exit on error
set -o pipefail # exit on pipeline error
set -u # treat unset variable as error
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
PARENT_DIR="$(dirname "$SCRIPT_DIR")"
ISO_DIR="$(dirname "$SCRIPT_DIR")"/iso
set +u
if [ -z $OUTPUT ]; then
. $SCRIPT_DIR/linux-live/buildconfig || exit 1
fi
set -u
. $SCRIPT_DIR/linux-live/minioslib || exit 1
. $SCRIPT_DIR/linux-live/config || exit 1
# don't change! use ./install instead
UNATTENDED="1"
CMD=(setup_host build_bootstrap build_chroot build_live build_modules build_iso)
# ============= main ================
BUILD_DIR=""
common_variables
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
new_run
fi
console_colours
allow_root_only
create_livekitname_install_symlink
create_completion
create_backup
# check number of args
if [[ $# == 0 || $# > 3 ]]; then help; fi
# loop through args
dash_flag=false
start_index=0
end_index=${#CMD[*]}
for ii in "$@"; do
if [[ $ii == "-" ]]; then
dash_flag=true
continue
fi
find_index $ii
if [[ $dash_flag == false ]]; then
start_index=$index
else
end_index=$(($index + 1))
fi
done
if [[ $dash_flag == false ]]; then
end_index=$(($start_index + 1))
fi
#loop through the commands
for ((ii = $start_index; ii < $end_index; ii++)); do
setup_build_dir
${CMD[ii]}
done
echo -e "${BOLD}${LIGHTYELLOW}$0${ENDCOLOUR} - ${LIGHTGREEN}Command completed successfully!${ENDCOLOUR}"

3
docker/01-runme.sh

@ -1,9 +1,8 @@
#!/bin/bash
# Several packages need to be installed to use Dockerfile.py
# It creates a local container that you can use to build minios-live
apt install -y docker.io
apt update && apt install -y docker.io python3-pip
systemctl start docker
systemctl enable docker
apt install -y python3-pip
pip3 install pydocker
python3 ./Dockerfile.py

7
docker/02-build.sh

@ -1,6 +1,3 @@
#!/bin/bash
#docker run -d --name mlc --privileged -v /build:/build local/mlc /build/slax/autoinstall -
#docker run --rm -it --privileged -v /build:/build local/mlc /build/slax/autoinstall -
#docker run --rm -it --privileged -v /build:/build local/mlc /build/slax/autoinstall build_modules_chroot -
docker run -it --name mlc --privileged -v /build:/build local/mlc /build/minios-xfce/autoinstall build_modules -
#docker run -d --name mlc --privileged -v /build:/build local/mlc
docker run -d --name mlc --privileged -v /build:/build local/mlc
#docker run --rm -it --name mlc --privileged -v /build:/build local/mlc /build/minios-slax/install build_modules -

8
docker/Dockerfile.py

@ -8,13 +8,12 @@ import pydocker # github.com/jen-soft/pydocker
logging.getLogger('').setLevel(logging.INFO)
logging.root.addHandler(logging.StreamHandler(sys.stdout))
class DockerFile(pydocker.DockerFile):
""" add here your custom features """
d = DockerFile(base_img='ubuntu:focal', name='local/mlc:latest')
#d = DockerFile(base_img='ubuntu:focal', name='local/mlc:latest')
#d = DockerFile(base_img='ubuntu:bionic', name='local/mlc:latest')
#d = DockerFile(base_img='debian:buster', name='local/mlc:latest')
d = DockerFile(base_img='debian:buster', name='local/mlc:latest')
d.RUN_bash_script('/opt/install.sh', r'''
touch /.minios-live-container
@ -63,7 +62,6 @@ rm -f /var/lib/dpkg/*-old
d.VOLUME = '/build'
d.WORKDIR = '/build/minios-slax'
# d.ENTRYPOINT = ["/opt/www-data/entrypoint.sh"]
d.CMD = ["/build/minios-slax/autoinstall", "-"]
d.CMD = ["/build/minios-slax/install", "-"]
d.build_img()

4
install

@ -16,8 +16,8 @@ set -u
. $SCRIPT_DIR/linux-live/minioslib || exit 1
. $SCRIPT_DIR/linux-live/config || exit 1
# don't change! use ./autoinstall instead
UNATTENDED="0"
# change this for unattended installation
UNATTENDED="1"
CMD=(setup_host build_bootstrap build_chroot build_live build_modules build_iso)

19
linux-live/basesystem/01-core/cloud.list

@ -0,0 +1,19 @@
mc
bash-completion
zip
unzip
xz-utils
zstd
#liblz4-tool
lz4
bzip2
net-tools
psmisc
netcat
ssh
dnsmasq
wget
curl
openssh-server
#network-manager
cloud-init

59
linux-live/basesystem/01-core/install

@ -6,34 +6,63 @@ set -u # treat unset variable as error
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
$APT_CMD update >>$OUTPUT 2>&1 &&
$APT_CMD install $APT_OPTIONS $APT_OPTIONS2 linux-image-$KERNEL_ARCH >>$OUTPUT 2>&1
echo "davfs2 davfs2/suid_file boolean true" | debconf-set-selections
if [ $PACKAGE_VARIANT != "cloud" ]; then
if [ $DISTRIBUTION_TYPE = "debian" ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
acpi-support-base
elif [ $DISTRIBUTION_TYPE = "ubuntu" ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS --no-install-suggests \
acpi-support
fi
fi
# install packages
if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD update >>$OUTPUT 2>&1 &&
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
$(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
$APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
fi
# install packages
if [ $DISTRIBUTION != "stretch" ] && [ $PACKAGE_VARIANT = "standard" ]; then
if [ $PACKAGE_VARIANT = "standard" ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD update >>$OUTPUT 2>&1 &&
$APT_CMD install $APT_OPTIONS \
zstd >>$OUTPUT 2>&1
if [ $DISTRIBUTION != "stretch" ] || [ $DISTRIBUTION != "xenial" ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
lz4 zstd >>$OUTPUT 2>&1
$APT_CMD install $APT_OPTIONS \
lz4 >>$OUTPUT 2>&1
else
$APT_CMD install $APT_OPTIONS \
liblz4-tool >>$OUTPUT 2>&1
fi
fi
if [ $DISTRIBUTION = "bullseye" ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD update >>$OUTPUT 2>&1 &&
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
selinux-policy-default >>$OUTPUT 2>&1
$APT_CMD install $APT_OPTIONS \
selinux-policy-default >>$OUTPUT 2>&1
sed -i "s,SELINUX=permissive,SELINUX=disabled,g" /etc/selinux/config
fi
if [ $DISTRIBUTION_TYPE = "debian" ]; then
if [ $PACKAGE_VARIANT = "cloud" ]; then
KERNEL_IMAGE="linux-image-$KERNEL_ARCH"
else
KERNEL_IMAGE="linux-image-$KERNEL_ARCH"
fi
elif [ $DISTRIBUTION_TYPE = "ubuntu" ]; then
KERNEL_IMAGE="linux-image-5.11.0-27-generic"
#KERNEL_IMAGE="linux-image-generic"
fi
$APT_CMD update >>$OUTPUT 2>&1 &&
$APT_CMD install $APT_OPTIONS $KERNEL_IMAGE >>$OUTPUT 2>&1
if [ $DISTRIBUTION_TYPE = "ubuntu" ]; then
$APT_CMD autoremove $APT_OPTIONS linux-modules-extra-* linux-firmware
fi

23
linux-live/basesystem/01-core/postinstall

@ -2,14 +2,17 @@
apt-get remove --yes vim* grub* debconf-i18n installation-report >>$OUTPUT 2>&1
cd /tmp
apt -y update >>$OUTPUT 2>&1
apt-get download acpi-support >>$OUTPUT 2>&1
dpkg -x acpi-support*.deb /tmp/acpisupport >>$OUTPUT 2>&1
if [ -L "/lib" ]; then
mkdir -p /tmp/acpisupport/usr/lib
(cd /tmp/acpisupport/lib && cp --parents -afr * /tmp/acpisupport/usr/lib)
rm -rf /tmp/acpisupport/lib
if [[ $DISTRIBUTION_TYPE != "ubuntu" ]]; then
cd /tmp
apt -y update >>$OUTPUT 2>&1
apt-get download acpi-support >>$OUTPUT 2>&1
dpkg -x acpi-support*.deb /tmp/acpisupport >>$OUTPUT 2>&1
if [ -L "/lib" ]; then
mkdir -p /tmp/acpisupport/usr/lib
(cd /tmp/acpisupport/lib && cp --parents -afr * /tmp/acpisupport/usr/lib)
rm -rf /tmp/acpisupport/lib
fi
cd /tmp/acpisupport
cp -aR * / >>$OUTPUT 2>&1
fi
cd /tmp/acpisupport
cp -aR * / >>$OUTPUT 2>&1

3
linux-live/basesystem/01-core/rootcopy-install/etc/apt/apt.conf.d/000Slax

@ -1,3 +0,0 @@
APT::Install-Recommends "0";
APT::Install-Suggests "0";
Acquire::Languages { "none"; }

140
linux-live/basesystem/01-core/rootcopy-install/home/live/.bashrc

@ -1,140 +0,0 @@
# ~/.bashrc: executed by bash(1) for non-login shells.
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
# for examples
# If not running interactively, don't do anything
case $- in
*i*) ;;
*) return;;
esac
# don't put duplicate lines or lines starting with space in the history.
# See bash(1) for more options
HISTCONTROL=ignoreboth
# append to the history file, don't overwrite it
shopt -s histappend
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
HISTSIZE=1000
HISTFILESIZE=2000
# check the window size after each command and, if necessary,
# update the values of LINES and COLUMNS.
shopt -s checkwinsize
# If set, the pattern "**" used in a pathname expansion context will
# match all files and zero or more directories and subdirectories.
#shopt -s globstar
# make less more friendly for non-text input files, see lesspipe(1)
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
# set variable identifying the chroot you work in (used in the prompt below)
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
debian_chroot=$(cat /etc/debian_chroot)
fi
# set a fancy prompt (non-color, unless we know we "want" color)
case "$TERM" in
xterm-color|*-256color) color_prompt=yes;;
esac
# uncomment for a colored prompt, if the terminal has the capability; turned
# off by default to not distract the user: the focus in a terminal window
# should be on the output of commands, not on the prompt
#force_color_prompt=yes
if [ -n "$force_color_prompt" ]; then
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
# We have color support; assume it's compliant with Ecma-48
# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
# a case would tend to support setf rather than setaf.)
color_prompt=yes
else
color_prompt=
fi
fi
if [ "$color_prompt" = yes ]; then
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
else
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
fi
unset color_prompt force_color_prompt
# If this is an xterm set the title to user@host:dir
case "$TERM" in
xterm*|rxvt*)
PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
;;
*)
;;
esac
# enable color support of ls and also add handy aliases
if [ -x /usr/bin/dircolors ]; then
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
alias ls='ls --color=auto'
#alias dir='dir --color=auto'
#alias vdir='vdir --color=auto'
alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
fi
# colored GCC warnings and errors
#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
# some more ls aliases
alias ll='ls -alF'
alias la='ls -A'
alias l='ls -CF'
# Add an "alert" alias for long running commands. Use like so:
# sleep 10; alert
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
# Alias definitions.
# You may want to put all your additions into a separate file like
# ~/.bash_aliases, instead of adding them here directly.
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases
fi
# enable programmable completion features (you don't need to enable
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
# sources /etc/bash.bashrc).
if ! shopt -oq posix; then
if [ -f /usr/share/bash-completion/bash_completion ]; then
. /usr/share/bash-completion/bash_completion
elif [ -f /etc/bash_completion ]; then
. /etc/bash_completion
fi
fi
apt-get()
{
if [ -e /var/cache/apt/pkgcache.bin ]; then
/usr/bin/apt-get "$@"
else
/usr/bin/apt-get update
/usr/bin/apt-get "$@"
fi
}
apt()
{
if [ -e /var/cache/apt/pkgcache.bin ]; then
/usr/bin/apt "$@"
else
/usr/bin/apt update
/usr/bin/apt "$@"
fi
}
export -f apt-get
export -f apt

54
linux-live/basesystem/01-core/rootcopy-install/usr/bin/apt2sb

@ -0,0 +1,54 @@
#!/bin/bash
TMP=/tmp/tmpfs$$
CHANGES=$TMP/changes
UNION=$TMP/union
BUNDLES=/run/initramfs/memory/bundles/
INSTALL="$1"
[ -n "$INSTALL" ] || exit
# In case multiple packages were specified on the command line.
INSTALL_ALL="$@"
mkdir -p $TMP
mount -t tmpfs tmpfs $TMP
mkdir -p $CHANGES
mkdir -p $UNION
#Changed from aufs to overlay mounts for Slax 10.
#mount -t aufs -o xino=$TMP/.xino,trunc_xino,br=$CHANGES aufs $UNION
## I don't use chromium so filter it out.
#\ls -1d $BUNDLES[0-1]* | grep -v chromium | while read MOD; do
#mount -o remount,add:1:$BUNDLES/$(basename $MOD)=ro aufs $UNION
#done
LOWERS=$(\ls -1dr $BUNDLES[0-1]* | grep -v chromium | tr '\n' ':')
LOWERS=${LOWERS/%:/}
rm -rf $TMP/xino ; mkdir $TMP/xino
mount -t overlay -o lowerdir=$LOWERS,upperdir=$CHANGES,workdir=$TMP/xino overlay $UNION
for d in boot dev proc sys tmp media mnt run; do
mkdir -p $UNION/$d
done
chmod ugo+rwx $UNION/tmp
mount --bind /dev $UNION/dev
mount --bind /proc $UNION/proc
mount --bind /sys $UNION/sys
echo "apt-get update; apt-get install --yes $INSTALL_ALL" >$UNION/doit
chmod ugo+x $UNION/doit
cp /etc/resolv.conf $UNION/etc/
chroot $UNION /doit
umount $UNION/sys
umount $UNION/proc
umount $UNION/dev
rm $CHANGES/doit
rmdir $CHANGES/* 2>/dev/null
#cleanup.sh $CHANGES
savechanges /"$INSTALL".sb $CHANGES
umount $UNION
umount $TMP
rmdir $TMP

1
linux-live/basesystem/01-core/standard.list

@ -14,7 +14,6 @@ xz-utils
ca-certificates
openssl
acpid
acpi-support-base
powermgmt-base
bzip2
gpart

BIN
linux-live/bootfiles-grub/EFI/boot/bootx64.efi

Binary file not shown.

BIN
linux-live/bootfiles-grub/EFI/boot/efiboot.img

Binary file not shown.

BIN
linux-live/bootfiles-grub/EFI/boot/grubx64.efi

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/bootlogo.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

42
linux-live/bootfiles-grub/boot/grub/grub.cfg

@ -0,0 +1,42 @@
set default="0"
set timeout="4"
set hidden_timeout_quiet=false
set gfxmode=auto
insmod efi_gop
insmod efi_uga
insmod gfxterm
terminal_output gfxterm
set color_normal=white/black
set color_highlight=black/white
loadfont /boot/grub/unicode.pf2
background_image /boot/grub/bootlogo.png
set default_settings="load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 apparmor=0 net.ifnames=0 biosdevname=0 quiet"
set perch_settings="minios.flags=perch"
set live_settings="minios.flags= "
set ram_settings="minios.flags=toram"
set console_settings="console=tty0 console=ttyS0,115200"
set debug_settings="load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 apparmor=0 debug net.ifnames=0 biosdevname=0"
set linux_64="/minios/boot/vmlinuz"
set initrd_img="/minios/boot/initrfs.img"
set default=0
set message="Loading kernel and ramdisk..."
menuentry "Run MiniOS (Persistent changes)"{
echo $message
search --set -f $linux_64
linux $linux_64 $default_settings $perch_settings
initrd $initrd_img
}
menuentry "Run MiniOS (Fresh start)"{
echo $message
search --set -f $linux_64
linux $linux_64 $default_settings $live_settings
initrd $initrd_img
}
menuentry "Run MiniOS (Copy to RAM)"{
echo $message
search --set -f $linux_64
linux $linux_64 $default_settings $ram_settings
initrd $initrd_img
}

31
linux-live/bootfiles-grub/boot/grub/grub.cfg.2

@ -0,0 +1,31 @@
set default="0"
set timeout="3"
set hidden_timeout_quiet=false
set gfxmode=auto
insmod efi_gop
insmod efi_uga
insmod gfxterm
terminal_output gfxterm
set color_normal=black/black
set color_highlight=black/white
loadfont /boot/grub/unicode.pf2
background_image /boot/grub/bootlogo.png
set default_settings="load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 apparmor=0 net.ifnames=0 biosdevname=0 quiet"
set perch_settings="slax.flags=perch,automount"
set live_settings="slax.flags=automount"
set ram_settings="slax.flags=toram"
set http_settings="from=http://ch2.crims0n.ru:8080/minios-cloud-loader.iso"
set console_settings="console=tty0 console=ttyS0,115200"
set debug_settings="load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 apparmor=0 debug net.ifnames=0 biosdevname=0"
set linux_64="/minios/boot/vmlinuz"
set initrd_img="/minios/boot/initrfs.img"
set default=0
set message="Loading kernel and ramdisk..."
menuentry "MiniOS (Copy to RAM)"{
echo $message
search --set -f $linux_64
linux $linux_64 $default_settings $ram_settings $http_settings $console_settings
initrd $initrd_img
}

BIN
linux-live/bootfiles-grub/boot/grub/unicode.pf2

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/acpi.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/adler32.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/ahci.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/all_video.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/aout.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/appleldr.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/archelp.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/at_keyboard.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/ata.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/backtrace.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/bfs.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/bitmap.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/bitmap_scale.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/blocklist.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/boot.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/bsd.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/bswap_test.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/btrfs.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/bufio.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cat.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cbfs.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cbls.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cbmemc.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cbtable.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cbtime.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/chain.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cmdline_cat_test.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cmp.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cmp_test.mod

Binary file not shown.

190
linux-live/bootfiles-grub/boot/grub/x86_64-efi/command.lst

@ -0,0 +1,190 @@
*acpi: acpi
*all_functional_test: functional_test
*background_image: gfxterm_background
*cat: cat
*cpuid: cpuid
*crc: hashsum
*cryptomount: cryptodisk
*echo: echo
*extract_syslinux_entries_configfile: syslinuxcfg
*extract_syslinux_entries_source: syslinuxcfg
*file: file
*functional_test: functional_test
*gettext: gettext
*hashsum: hashsum
*hdparm: hdparm
*hello: hello
*help: help
*hexdump: hexdump
*inb: iorw
*inl: iorw
*inw: iorw
*keystatus: keystatus
*kfreebsd: bsd
*knetbsd: bsd
*kopenbsd: bsd
*list_env: loadenv
*load_env: loadenv
*loopback: loopback
*ls: ls
*lsacpi: lsacpi
*lspci: lspci
*md5sum: hashsum
*menuentry: normal
*pcidump: pcidump
*probe: probe
*read_byte: memrw
*read_dword: memrw
*read_word: memrw
*regexp: regexp
*save_env: loadenv
*search: search
*serial: serial
*setpci: setpci
*sha1sum: hashsum
*sha256sum: hashsum
*sha512sum: hashsum
*sleep: sleep
*submenu: normal
*syslinux_configfile: syslinuxcfg
*syslinux_source: syslinuxcfg
*terminfo: terminfo
*test_blockarg: test_blockarg
*testspeed: testspeed
*tr: tr
*trust: verify
*verify_detached: verify
*xnu_splash: xnu
*zfskey: zfscrypt
.: configfile
[: test
appleloader: appleldr
authenticate: normal
background_color: gfxterm_background
backtrace: backtrace
badram: mmap
blocklist: blocklist
boot: boot
break: normal
cat: minicmd
cbmemc: cbmemc
chainloader: chain
clear: normal
cmp: cmp
configfile: configfile
continue: normal
coreboot_boottime: cbtime
cutmem: mmap
date: date
distrust: verify
dump: minicmd
eval: eval
exit: minicmd
export: normal
extract_entries_configfile: configfile
extract_entries_source: configfile
extract_legacy_entries_configfile: legacycfg
extract_legacy_entries_source: legacycfg
fakebios: loadbios
false: true
fix_video: fixvideo
fwsetup: efifwsetup
gptsync: gptsync
halt: halt
help: minicmd
hexdump_random: random
initrd16: linux16
initrd: linux
initrdefi: linuxefi
keymap: keylayouts
kfreebsd_loadenv: bsd
kfreebsd_module: bsd
kfreebsd_module_elf: bsd
knetbsd_module: bsd
knetbsd_module_elf: bsd
kopenbsd_ramdisk: bsd
legacy_check_password: legacycfg
legacy_configfile: legacycfg
legacy_initrd: legacycfg
legacy_initrd_nounzip: legacycfg
legacy_kernel: legacycfg
legacy_password: legacycfg
legacy_source: legacycfg
linux16: linux16
linux: linux
linuxefi: linuxefi
list_trusted: verify
loadbios: loadbios
loadfont: font
lscoreboot: cbls
lsefi: lsefi
lsefimmap: lsefimmap
lsefisystab: lsefisystab
lsfonts: font
lsmmap: lsmmap
lsmod: minicmd
lssal: lssal
macppcbless: macbless
mactelbless: macbless
module2: multiboot2
module: multiboot
multiboot2: multiboot2
multiboot: multiboot
nativedisk: nativedisk
net_add_addr: net
net_add_dns: net
net_add_route: net
net_bootp6: net
net_bootp: net
net_del_addr: net
net_del_dns: net
net_del_route: net
net_get_dhcp_option: net
net_ipv6_autoconf: net
net_ls_addr: net
net_ls_cards: net
net_ls_dns: net
net_ls_routes: net
net_nslookup: net
normal: normal
normal_exit: normal
outb: iorw
outl: iorw
outw: iorw
parttool: parttool
password: password
password_pbkdf2: password_pbkdf2
play: play
read: read
reboot: reboot
return: normal
rmmod: minicmd
search.file: search_fs_file
search.fs_label: search_label
search.fs_uuid: search_fs_uuid
setparams: normal
shift: normal
source: configfile
terminal_input: terminal
terminal_output: terminal
test: test
testload: testload
time: time
true: true
usb: usbtest
videoinfo: videoinfo
videotest: videotest
write_byte: memrw
write_dword: memrw
write_word: memrw
xnu_devprop_load: xnu
xnu_kernel64: xnu
xnu_kernel: xnu
xnu_kext: xnu
xnu_kextdir: xnu
xnu_mkext: xnu
xnu_ramdisk: xnu
xnu_resume: xnu
xnu_uuid: xnu_uuid
zfs-bootfs: zfsinfo
zfsinfo: zfsinfo

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cpio.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cpio_be.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cpuid.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/crc64.mod

Binary file not shown.

45
linux-live/bootfiles-grub/boot/grub/x86_64-efi/crypto.lst

@ -0,0 +1,45 @@
RIJNDAEL: gcry_rijndael
RIJNDAEL192: gcry_rijndael
RIJNDAEL256: gcry_rijndael
AES128: gcry_rijndael
AES-128: gcry_rijndael
AES-192: gcry_rijndael
AES-256: gcry_rijndael
ADLER32: adler32
CRC64: crc64
ARCFOUR: gcry_arcfour
BLOWFISH: gcry_blowfish
CAMELLIA128: gcry_camellia
CAMELLIA192: gcry_camellia
CAMELLIA256: gcry_camellia
CAST5: gcry_cast5
CRC32: gcry_crc
CRC32RFC1510: gcry_crc
CRC24RFC2440: gcry_crc
DES: gcry_des
3DES: gcry_des
DSA: gcry_dsa
IDEA: gcry_idea
MD4: gcry_md4
MD5: gcry_md5
RFC2268_40: gcry_rfc2268
AES: gcry_rijndael
AES192: gcry_rijndael
AES256: gcry_rijndael
RIPEMD160: gcry_rmd160
RSA: gcry_rsa
SEED: gcry_seed
SERPENT128: gcry_serpent
SERPENT192: gcry_serpent
SERPENT256: gcry_serpent
SHA1: gcry_sha1
SHA224: gcry_sha256
SHA256: gcry_sha256
SHA512: gcry_sha512
SHA384: gcry_sha512
TIGER192: gcry_tiger
TIGER: gcry_tiger
TIGER2: gcry_tiger
TWOFISH: gcry_twofish
TWOFISH128: gcry_twofish
WHIRLPOOL: gcry_whirlpool

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/crypto.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cryptodisk.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/cs5536.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/ctz_test.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/date.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/datehook.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/datetime.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/disk.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/diskfilter.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/div.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/div_test.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/dm_nv.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/echo.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/efi_gop.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/efi_uga.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/efifwsetup.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/efinet.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/ehci.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/elf.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/eval.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/exfat.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/exfctest.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/ext2.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/fat.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/file.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/fixvideo.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/font.mod

Binary file not shown.

36
linux-live/bootfiles-grub/boot/grub/x86_64-efi/fs.lst

@ -0,0 +1,36 @@
affs
afs
bfs
btrfs
cbfs
cpio
cpio_be
exfat
ext2
fat
hfs
hfsplus
iso9660
jfs
minix
minix2
minix2_be
minix3
minix3_be
minix_be
newc
nilfs2
ntfs
odc
procfs
reiserfs
romfs
sfs
squash4
tar
udf
ufs1
ufs1_be
ufs2
xfs
zfs

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_arcfour.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_blowfish.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_camellia.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_cast5.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_crc.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_des.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_dsa.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_idea.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_md4.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_md5.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_rfc2268.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_rijndael.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_rmd160.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_rsa.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_seed.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_serpent.mod

Binary file not shown.

BIN
linux-live/bootfiles-grub/boot/grub/x86_64-efi/gcry_sha1.mod

Binary file not shown.

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save