From 19bb3bd82ff878aee854eb33287bafea210b1b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Pleva=C4=8D?= Date: Mon, 8 Feb 2021 16:36:28 +0000 Subject: [PATCH] install script fix --- airootfs/etc/skel/.bashrc | 99 +++++++++++++++ airootfs/etc/sudoers | 97 +++++++++++++++ airootfs/root/Desktop/install | 4 +- airootfs/to_install/etc/hostname | 1 - airootfs/to_install/etc/mkinitcpio.conf | 70 ----------- .../to_install/etc/mkinitcpio.d/linux.preset | 11 -- airootfs/to_install/etc/shadow | 1 - .../xfce-perchannel-xml/xfce4-desktop.xml | 40 +++--- .../xfce-perchannel-xml/xfce4-panel.xml | 11 +- .../xfconf/xfce-perchannel-xml/xfwm4.xml | 2 +- airootfs/to_install/etc/ssh/sshd_config | 116 ------------------ .../etc/systemd/network/20-ethernet.network | 13 -- .../cloud-config.service | 1 - .../cloud-final.service | 1 - .../cloud-init-local.service | 1 - .../cloud-init.service | 1 - ...dbus-org.freedesktop.nm-dispatcher.service | 1 - .../system/getty@tty1.service.d/override.conf | 3 - .../NetworkManager.service | 1 - .../multi-user.target.wants/sshd.service | 1 - .../systemd-networkd.service | 1 - .../systemd-resolved.service | 1 - .../NetworkManager-wait-online.service | 1 - .../systemd-networkd-wait-online.service | 1 - .../systemd-networkd.socket | 1 - .../wait-for-only-one-interface.conf | 5 - airootfs/to_install/packages.x86_64 | 5 +- airootfs/usr/local/bin/emuhere | 13 ++ profiledef.sh | 1 + 29 files changed, 246 insertions(+), 258 deletions(-) create mode 100644 airootfs/etc/skel/.bashrc create mode 100644 airootfs/etc/sudoers delete mode 100644 airootfs/to_install/etc/hostname delete mode 100644 airootfs/to_install/etc/mkinitcpio.conf delete mode 100644 airootfs/to_install/etc/mkinitcpio.d/linux.preset delete mode 100644 airootfs/to_install/etc/shadow delete mode 100644 airootfs/to_install/etc/ssh/sshd_config delete mode 100644 airootfs/to_install/etc/systemd/network/20-ethernet.network delete mode 120000 airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-config.service delete mode 120000 airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-final.service delete mode 120000 airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service delete mode 120000 airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-init.service delete mode 120000 airootfs/to_install/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service delete mode 100644 airootfs/to_install/etc/systemd/system/getty@tty1.service.d/override.conf delete mode 120000 airootfs/to_install/etc/systemd/system/multi-user.target.wants/NetworkManager.service delete mode 120000 airootfs/to_install/etc/systemd/system/multi-user.target.wants/sshd.service delete mode 120000 airootfs/to_install/etc/systemd/system/multi-user.target.wants/systemd-networkd.service delete mode 120000 airootfs/to_install/etc/systemd/system/multi-user.target.wants/systemd-resolved.service delete mode 120000 airootfs/to_install/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service delete mode 120000 airootfs/to_install/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service delete mode 120000 airootfs/to_install/etc/systemd/system/sockets.target.wants/systemd-networkd.socket delete mode 100644 airootfs/to_install/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf create mode 100755 airootfs/usr/local/bin/emuhere diff --git a/airootfs/etc/skel/.bashrc b/airootfs/etc/skel/.bashrc new file mode 100644 index 0000000..9c972ac --- /dev/null +++ b/airootfs/etc/skel/.bashrc @@ -0,0 +1,99 @@ +# /etc/bash.bashrc +# +# https://wiki.archlinux.org/index.php/Color_Bash_Prompt +# +# This file is sourced by all *interactive* bash shells on startup, +# including some apparently interactive shells such as scp and rcp +# that can't tolerate any output. So make sure this doesn't display +# anything or bad things will happen ! + +EDITOR=nano; export EDITOR + +# Test for an interactive shell. There is no need to set anything +# past this point for scp and rcp, and it's important to refrain from +# outputting anything in those cases. + +# If not running interactively, don't do anything! +[[ $- != *i* ]] && return + +# Bash won't get SIGWINCH if another process is in the foreground. +# Enable checkwinsize so that bash will check the terminal size when +# it regains control. +# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11) +shopt -s checkwinsize + +# Enable history appending instead of overwriting. +shopt -s histappend + +case ${TERM} in + xterm*|rxvt*|Eterm|aterm|kterm|gnome*) + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' + + ;; + screen*) + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' + ;; +esac + + +# fortune is a simple program that displays a pseudorandom message +# from a database of quotations at logon and/or logout. +# If you wish to use it, please install "fortune-mod" from the +# official repositories, then uncomment the following line: + +#[[ "$PS1" ]] && /usr/bin/fortune + +# Set colorful PS1 only on colorful terminals. +# dircolors --print-database uses its own built-in database +# instead of using /etc/DIR_COLORS. Try to use the external file +# first to take advantage of user additions. Use internal bash +# globbing instead of external grep binary. + +# sanitize TERM: +safe_term=${TERM//[^[:alnum:]]/?} +match_lhs="" + +[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)" +[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(/dev/null \ + && match_lhs=$(dircolors --print-database) + + + # we have colors :-) + + # Enable colors for ls, etc. Prefer ~/.dir_colors + if type -P dircolors >/dev/null ; then + if [[ -f ~/.dir_colors ]] ; then + eval $(dircolors -b ~/.dir_colors) + elif [[ -f /etc/DIR_COLORS ]] ; then + eval $(dircolors -b /etc/DIR_COLORS) + fi + fi + + #PS1="$(if [[ ${EUID} == 0 ]]; then echo '\[\033[01;31m\]\h'; else echo '\[\033[01;32m\]\u@\h'; fi)\[\033[01;34m\] \w \$([[ \$? != 0 ]] && echo \"\[\033[01;31m\]:(\[\033[01;34m\] \")\\$\[\033[00m\] " + PS1="\[\e[0;37m\][ \[\e[0;32m\]\u\[\e[0;37m\]@\[\e[0;31m\]\h \[\e[0;36m\]\W \[\e[0;37m\]] \[\e[0;37m\]$ \[\e[0m\]" + + # Use this other PS1 string if you want \W for root and \w for all other users: + # PS1="$(if [[ ${EUID} == 0 ]]; then echo '\[\033[01;31m\]\h\[\033[01;34m\] \W'; else echo '\[\033[01;32m\]\u@\h\[\033[01;34m\] \w'; fi) \$([[ \$? != 0 ]] && echo \"\[\033[01;31m\]:(\[\033[01;34m\] \")\\$\[\033[00m\] " + + alias ls="ls --color=auto" + alias dir="dir --color=auto" + alias grep="grep --color=auto" + alias dmesg='dmesg --color' + alias ip='ip -color=auto' + alias diff='diff --color=auto' + +PS2="> " +PS3="> " +PS4="+ " + +# Try to keep environment pollution down, EPA loves us :-) +unset safe_term match_lhs + +# Try to enable the auto-completion (type: "pacman -S bash-completion" to install it). +[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion + +# Try to enable the "Command not found" hook ("pacman -S pkgfile" to install it). +# See also: https://wiki.archlinux.org/index.php/Bash#The_.22command_not_found.22_hook +[ -r /usr/share/doc/pkgfile/command-not-found.bash ] && . /usr/share/doc/pkgfile/command-not-found.bash diff --git a/airootfs/etc/sudoers b/airootfs/etc/sudoers new file mode 100644 index 0000000..156b42d --- /dev/null +++ b/airootfs/etc/sudoers @@ -0,0 +1,97 @@ +## sudoers file. +## +## This file MUST be edited with the 'visudo' command as root. +## Failure to use 'visudo' may result in syntax or file permission errors +## that prevent sudo from running. +## +## See the sudoers man page for the details on how to write a sudoers file. +## + +## +## Host alias specification +## +## Groups of machines. These may include host names (optionally with wildcards), +## IP addresses, network numbers or netgroups. +# Host_Alias WEBSERVERS = www1, www2, www3 + +## +## User alias specification +## +## Groups of users. These may consist of user names, uids, Unix groups, +## or netgroups. +# User_Alias ADMINS = millert, dowdy, mikef + +## +## Cmnd alias specification +## +## Groups of commands. Often used to group related commands together. +# Cmnd_Alias PROCESSES = /usr/bin/nice, /bin/kill, /usr/bin/renice, \ +# /usr/bin/pkill, /usr/bin/top +# Cmnd_Alias REBOOT = /sbin/halt, /sbin/reboot, /sbin/poweroff + +## +## Defaults specification +## +## You may wish to keep some of the following environment variables +## when running commands via sudo. +## +## Locale settings +# Defaults env_keep += "LANG LANGUAGE LINGUAS LC_* _XKB_CHARSET" +## +## Run X applications through sudo; HOME is used to find the +## .Xauthority file. Note that other programs use HOME to find +## configuration files and this may lead to privilege escalation! +# Defaults env_keep += "HOME" +## +## X11 resource path settings +# Defaults env_keep += "XAPPLRESDIR XFILESEARCHPATH XUSERFILESEARCHPATH" +## +## Desktop path settings +# Defaults env_keep += "QTDIR KDEDIR" +## +## Allow sudo-run commands to inherit the callers' ConsoleKit session +# Defaults env_keep += "XDG_SESSION_COOKIE" +## +## Uncomment to enable special input methods. Care should be taken as +## this may allow users to subvert the command being run via sudo. +# Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER" +## +## Uncomment to use a hard-coded PATH instead of the user's to find commands +# Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +## +## Uncomment to send mail if the user does not enter the correct password. +# Defaults mail_badpass +## +## Uncomment to enable logging of a command's output, except for +## sudoreplay and reboot. Use sudoreplay to play back logged sessions. +# Defaults log_output +# Defaults!/usr/bin/sudoreplay !log_output +# Defaults!/usr/local/bin/sudoreplay !log_output +# Defaults!REBOOT !log_output + +## +## Runas alias specification +## + +## +## User privilege specification +## +root ALL=(ALL) ALL + +## Uncomment to allow members of group wheel to execute any command +# %wheel ALL=(ALL) ALL + +## Same thing without a password +# %wheel ALL=(ALL) NOPASSWD: ALL + +## Uncomment to allow members of group sudo to execute any command + %sudo ALL=(ALL) ALL + +## Uncomment to allow any user to run sudo if they know the password +## of the user they are running the command as (root by default). +# Defaults targetpw # Ask for the password of the target user +# ALL ALL=(ALL) ALL # WARNING: only use this together with 'Defaults targetpw' + +## Read drop-in files from /etc/sudoers.d +## (the '#' here does not indicate a comment) +#includedir /etc/sudoers.d diff --git a/airootfs/root/Desktop/install b/airootfs/root/Desktop/install index 050a059..c142987 100644 --- a/airootfs/root/Desktop/install +++ b/airootfs/root/Desktop/install @@ -77,6 +77,8 @@ cp -r /to_install/* /mnt/ #remove autologin rm -rf /mnt/etc/systemd/system/getty@tty1.service.d/ +rm -f /mnt/do_not_edit + genfstab -U /mnt >> /mnt/etc/fstab ## @@ -110,8 +112,8 @@ sed -r '/^#/d' /packages.x86_64 | pacman --noconfirm -S - rm -f /packages.x86_64 #user create +groupadd sudo useradd -m -G sudo "$username" -cp -r /etc/skel/* "/home/$username" echo "$username:$userpass" | chpasswd echo "root:$rootpass" | chpasswd diff --git a/airootfs/to_install/etc/hostname b/airootfs/to_install/etc/hostname deleted file mode 100644 index 45544ae..0000000 --- a/airootfs/to_install/etc/hostname +++ /dev/null @@ -1 +0,0 @@ -saturnarch diff --git a/airootfs/to_install/etc/mkinitcpio.conf b/airootfs/to_install/etc/mkinitcpio.conf deleted file mode 100644 index 4b7b7fb..0000000 --- a/airootfs/to_install/etc/mkinitcpio.conf +++ /dev/null @@ -1,70 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# vim:set ft=sh -# MODULES -# The following modules are loaded before any boot hooks are -# run. Advanced users may wish to specify all system modules -# in this array. For instance: -# MODULES=(piix ide_disk reiserfs) -MODULES=() - -# BINARIES -# This setting includes any additional binaries a given user may -# wish into the CPIO image. This is run last, so it may be used to -# override the actual binaries included by a given hook -# BINARIES are dependency parsed, so you may safely ignore libraries -BINARIES=() - -# FILES -# This setting is similar to BINARIES above, however, files are added -# as-is and are not parsed in any way. This is useful for config files. -FILES=() - -# HOOKS -# This is the most important setting in this file. The HOOKS control the -# modules and scripts added to the image, and what happens at boot time. -# Order is important, and it is recommended that you do not change the -# order in which HOOKS are added. Run 'mkinitcpio -H ' for -# help on a given hook. -# 'base' is _required_ unless you know precisely what you are doing. -# 'udev' is _required_ in order to automatically load modules -# 'filesystems' is _required_ unless you specify your fs modules in MODULES -# Examples: -## This setup specifies all modules in the MODULES setting above. -## No raid, lvm2, or encrypted root is needed. -# HOOKS=(base) -# -## This setup will autodetect all modules for your system and should -## work as a sane default -# HOOKS=(base udev autodetect block filesystems) -# -## This setup will generate a 'full' image which supports most systems. -## No autodetection is done. -# HOOKS=(base udev block filesystems) -# -## This setup assembles a pata mdadm array with an encrypted root FS. -## Note: See 'mkinitcpio -H mdadm' for more information on raid devices. -# HOOKS=(base udev block mdadm encrypt filesystems) -# -## This setup loads an lvm2 volume group on a usb device. -# HOOKS=(base udev block lvm2 filesystems) -# -## NOTE: If you have /usr on a separate partition, you MUST include the -# usr, fsck and shutdown hooks. -HOOKS=(base udev modconf archiso block filesystems) - -# COMPRESSION -# Use this to compress the initramfs image. By default, gzip compression -# is used. Use 'cat' to create an uncompressed image. -#COMPRESSION="gzip" -#COMPRESSION="bzip2" -#COMPRESSION="lzma" -#COMPRESSION="xz" -#COMPRESSION="lzop" -#COMPRESSION="lz4" -#COMPRESSION="zstd" - -# COMPRESSION_OPTIONS -# Additional options for the compressor -#COMPRESSION_OPTIONS=() diff --git a/airootfs/to_install/etc/mkinitcpio.d/linux.preset b/airootfs/to_install/etc/mkinitcpio.d/linux.preset deleted file mode 100644 index d35f137..0000000 --- a/airootfs/to_install/etc/mkinitcpio.d/linux.preset +++ /dev/null @@ -1,11 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# mkinitcpio preset file for the 'linux' package on archiso - -PRESETS=('archiso') - -ALL_kver='/boot/vmlinuz-linux' -ALL_config='/etc/mkinitcpio.conf' - -archiso_image="/boot/initramfs-linux.img" diff --git a/airootfs/to_install/etc/shadow b/airootfs/to_install/etc/shadow deleted file mode 100644 index 7edfd69..0000000 --- a/airootfs/to_install/etc/shadow +++ /dev/null @@ -1 +0,0 @@ -root::14871:::::: diff --git a/airootfs/to_install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/airootfs/to_install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 9a1fe19..c526940 100644 --- a/airootfs/to_install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/airootfs/to_install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -1,34 +1,36 @@ - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/airootfs/to_install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/airootfs/to_install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml index bb3c167..934a43f 100644 --- a/airootfs/to_install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ b/airootfs/to_install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -18,6 +18,7 @@ + @@ -60,7 +61,9 @@ - + + + @@ -74,6 +77,9 @@ + + + @@ -115,5 +121,8 @@ + + + diff --git a/airootfs/to_install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/airootfs/to_install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml index 9f671e4..b4f1d48 100644 --- a/airootfs/to_install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml +++ b/airootfs/to_install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml @@ -73,7 +73,7 @@ - + diff --git a/airootfs/to_install/etc/ssh/sshd_config b/airootfs/to_install/etc/ssh/sshd_config deleted file mode 100644 index 8ef1758..0000000 --- a/airootfs/to_install/etc/ssh/sshd_config +++ /dev/null @@ -1,116 +0,0 @@ -# $OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $ - -# This is the sshd server system-wide configuration file. See -# sshd_config(5) for more information. - -# This sshd was compiled with PATH=/usr/local/sbin:/usr/local/bin:/usr/bin - -# The strategy used for options in the default sshd_config shipped with -# OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options override the -# default value. - -#Port 22 -#AddressFamily any -#ListenAddress 0.0.0.0 -#ListenAddress :: - -#HostKey /etc/ssh/ssh_host_rsa_key -#HostKey /etc/ssh/ssh_host_ecdsa_key -#HostKey /etc/ssh/ssh_host_ed25519_key - -# Ciphers and keying -#RekeyLimit default none - -# Logging -#SyslogFacility AUTH -#LogLevel INFO - -# Authentication: - -#LoginGraceTime 2m -PermitRootLogin yes -#StrictModes yes -#MaxAuthTries 6 -#MaxSessions 10 - -#PubkeyAuthentication yes - -# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 -# but this is overridden so installations will only check .ssh/authorized_keys -AuthorizedKeysFile .ssh/authorized_keys - -#AuthorizedPrincipalsFile none - -#AuthorizedKeysCommand none -#AuthorizedKeysCommandUser nobody - -# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts -#HostbasedAuthentication no -# Change to yes if you don't trust ~/.ssh/known_hosts for -# HostbasedAuthentication -#IgnoreUserKnownHosts no -# Don't read the user's ~/.rhosts and ~/.shosts files -#IgnoreRhosts yes - -# To disable tunneled clear text passwords, change to no here! -#PasswordAuthentication yes -#PermitEmptyPasswords no - -# Change to no to disable s/key passwords -ChallengeResponseAuthentication no - -# Kerberos options -#KerberosAuthentication no -#KerberosOrLocalPasswd yes -#KerberosTicketCleanup yes -#KerberosGetAFSToken no - -# GSSAPI options -#GSSAPIAuthentication no -#GSSAPICleanupCredentials yes - -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass -# the setting of "PermitRootLogin without-password". -# If you just want the PAM account and session checks to run without -# PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. -UsePAM yes - -#AllowAgentForwarding yes -#AllowTcpForwarding yes -#GatewayPorts no -#X11Forwarding no -#X11DisplayOffset 10 -#X11UseLocalhost yes -#PermitTTY yes -PrintMotd no # pam does that -#PrintLastLog yes -#TCPKeepAlive yes -#PermitUserEnvironment no -#Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -#UseDNS no -#PidFile /run/sshd.pid -#MaxStartups 10:30:100 -#PermitTunnel no -#ChrootDirectory none -#VersionAddendum none - -# no default banner path -#Banner none - -# override default of no subsystems -Subsystem sftp /usr/lib/ssh/sftp-server - -# Example of overriding settings on a per-user basis -#Match User anoncvs -# X11Forwarding no -# AllowTcpForwarding no -# PermitTTY no -# ForceCommand cvs server diff --git a/airootfs/to_install/etc/systemd/network/20-ethernet.network b/airootfs/to_install/etc/systemd/network/20-ethernet.network deleted file mode 100644 index efa309c..0000000 --- a/airootfs/to_install/etc/systemd/network/20-ethernet.network +++ /dev/null @@ -1,13 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -[Match] -Name=en* -Name=eth* - -[Network] -DHCP=yes -IPv6PrivacyExtensions=yes - -[DHCP] -RouteMetric=512 diff --git a/airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-config.service b/airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-config.service deleted file mode 120000 index ebc50f0..0000000 --- a/airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-config.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/cloud-config.service \ No newline at end of file diff --git a/airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-final.service b/airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-final.service deleted file mode 120000 index 80fa3c8..0000000 --- a/airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-final.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/cloud-final.service \ No newline at end of file diff --git a/airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service b/airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service deleted file mode 120000 index dd8e9f1..0000000 --- a/airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/cloud-init-local.service \ No newline at end of file diff --git a/airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-init.service deleted file mode 120000 index 24c7a26..0000000 --- a/airootfs/to_install/etc/systemd/system/cloud-init.target.wants/cloud-init.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/cloud-init.service \ No newline at end of file diff --git a/airootfs/to_install/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service b/airootfs/to_install/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service deleted file mode 120000 index a7e5cd4..0000000 --- a/airootfs/to_install/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/NetworkManager-dispatcher.service \ No newline at end of file diff --git a/airootfs/to_install/etc/systemd/system/getty@tty1.service.d/override.conf b/airootfs/to_install/etc/systemd/system/getty@tty1.service.d/override.conf deleted file mode 100644 index a76e4bf..0000000 --- a/airootfs/to_install/etc/systemd/system/getty@tty1.service.d/override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStart= -ExecStart=-/usr/bin/agetty --autologin root --noclear %I $TERM diff --git a/airootfs/to_install/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/airootfs/to_install/etc/systemd/system/multi-user.target.wants/NetworkManager.service deleted file mode 120000 index e874a9b..0000000 --- a/airootfs/to_install/etc/systemd/system/multi-user.target.wants/NetworkManager.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/NetworkManager.service \ No newline at end of file diff --git a/airootfs/to_install/etc/systemd/system/multi-user.target.wants/sshd.service b/airootfs/to_install/etc/systemd/system/multi-user.target.wants/sshd.service deleted file mode 120000 index d21ebd9..0000000 --- a/airootfs/to_install/etc/systemd/system/multi-user.target.wants/sshd.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/sshd.service \ No newline at end of file diff --git a/airootfs/to_install/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/airootfs/to_install/etc/systemd/system/multi-user.target.wants/systemd-networkd.service deleted file mode 120000 index 4c158e6..0000000 --- a/airootfs/to_install/etc/systemd/system/multi-user.target.wants/systemd-networkd.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-networkd.service \ No newline at end of file diff --git a/airootfs/to_install/etc/systemd/system/multi-user.target.wants/systemd-resolved.service b/airootfs/to_install/etc/systemd/system/multi-user.target.wants/systemd-resolved.service deleted file mode 120000 index 4f6ae34..0000000 --- a/airootfs/to_install/etc/systemd/system/multi-user.target.wants/systemd-resolved.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-resolved.service \ No newline at end of file diff --git a/airootfs/to_install/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service b/airootfs/to_install/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service deleted file mode 120000 index b78b586..0000000 --- a/airootfs/to_install/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/NetworkManager-wait-online.service \ No newline at end of file diff --git a/airootfs/to_install/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/airootfs/to_install/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service deleted file mode 120000 index 7d6ad92..0000000 --- a/airootfs/to_install/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-networkd-wait-online.service \ No newline at end of file diff --git a/airootfs/to_install/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/airootfs/to_install/etc/systemd/system/sockets.target.wants/systemd-networkd.socket deleted file mode 120000 index 51942c8..0000000 --- a/airootfs/to_install/etc/systemd/system/sockets.target.wants/systemd-networkd.socket +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-networkd.socket \ No newline at end of file diff --git a/airootfs/to_install/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/airootfs/to_install/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf deleted file mode 100644 index a4d7442..0000000 --- a/airootfs/to_install/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -[Service] -ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any diff --git a/airootfs/to_install/packages.x86_64 b/airootfs/to_install/packages.x86_64 index e1882d2..13793ea 100644 --- a/airootfs/to_install/packages.x86_64 +++ b/airootfs/to_install/packages.x86_64 @@ -34,13 +34,11 @@ ipw2200-fw irssi iwd jfsutils -lftp linux linux-atm linux-firmware lsscsi lvm2 -lynx man-db man-pages mdadm @@ -165,6 +163,7 @@ sudo git autoconf automake +make binutils ffmpeg ffmpegthumbnailer @@ -175,13 +174,11 @@ htop imagemagick p7zip patch -pcmanfm pkg-config scrot ttf-dejavu unrar unzip -vim nano wget xarchiver diff --git a/airootfs/usr/local/bin/emuhere b/airootfs/usr/local/bin/emuhere new file mode 100755 index 0000000..f26d3db --- /dev/null +++ b/airootfs/usr/local/bin/emuhere @@ -0,0 +1,13 @@ +#!/bin/bash + +if [ -z "$1" ] +then + echo + echo "No Docker Image supplied. Using archlinux" + echo + image='archlinux' +else + image=$1 +fi + +docker run -it -v "$(pwd):/mnt" -w '/mnt' $image diff --git a/profiledef.sh b/profiledef.sh index 874cfc6..f038bcd 100644 --- a/profiledef.sh +++ b/profiledef.sh @@ -14,5 +14,6 @@ airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' file_permissions=( ["/etc/shadow"]="0:0:400" ["/usr/local/bin/apt"]="1:1:1" + ["/usr/local/bin/emuhere"]="1:1:1" ["/root/Desktop/install"]="1:1:1" )