diff --git a/arch-graphical-install-auto.sh b/arch-graphical-install-auto.sh index 75e1b21..a1a32cd 100755 --- a/arch-graphical-install-auto.sh +++ b/arch-graphical-install-auto.sh @@ -301,16 +301,6 @@ echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> $SUDOERS standartinstallation -# Your commands - -# startup -cp /opt/${repo}/scripts/startup-script.sh /usr/bin/startup-script -chmod 755 /usr/bin/startup-script - -cp /opt/${repo}/service/startup-script.service /etc/systemd/system/ -chmod 644 /etc/systemd/system/startup-script.service -systemctl enable startup-script.service - echo "Packetliste2 Ende" echo "Beginne mit dem Konfigurieren des Systems :D" diff --git a/scripts/startup-script.sh b/scripts/startup-script.sh deleted file mode 100755 index acd7d14..0000000 --- a/scripts/startup-script.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env bash - -set -x - -cmdlineparameter=$(cat /proc/cmdline) -repo=SpectreOS -user=user1 - -if cat /etc/passwd | grep "x:1000" > /dev/null; then - tempuser=$(cat /etc/passwd | grep "x:1000" | awk '{print $1}') - user=${tempuser%%:*} -#else -# user=$(whoami) -fi - -for wort in $(cat /proc/cmdline) -do - echo "Parameter ${wort%=*} = ${wort#*=}" - if ! export ${wort%=*}=${wort#*=}; then echo "cannot export ${wort}!!!"; fi -done - - -function loadnvidia () { - - echo ":: nvidia driver loading..." - - mkdir -p -m 755 /etc/X11/xorg.conf.d/ - - nvidia-xconfig - - if modprobe nvidia; then - echo "nvidia driver loaded" - else - echo "nvidia driver failed" - fi - - if [ -f "/etc/X11/xorg.conf.d/20-nouveau.conf" ]; then - rm /etc/X11/xorg.conf.d/20-nouveau.conf - fi - -} - -if cat /proc/cmdline | grep "nvidia=y" 1>/dev/null 2>&1; then - - loadnvidia - -fi - -# set systemconfiguration - -if cat /proc/cmdline | grep "lang" 1>/dev/null 2>&1; then - - if ! cat /etc/locale.conf | grep LANG=${lang}.UTF-8 1>/dev/null 2>&1; then - - # - echo "LANG=${lang}.UTF-8" > /etc/locale.conf - echo "LC_COLLATE=C" >> /etc/locale.conf - echo "LANGUAGE=${lang}" >> /etc/locale.conf - # - echo "${lang}.UTF-8 UTF-8" > /etc/locale.gen - echo "${lang} ISO-8859-1" >> /etc/locale.gen - #echo "${lang}@euro ISO-8859-15" >> /etc/locale.gen - if ! grep 'en_US.UTF-8 UTF-8' /etc/locale.gen 1>/dev/null 2>&1; then - echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen - fi - - locale-gen - - fi - # -fi - -if cat /proc/cmdline | grep "keytable" 1>/dev/null 2>&1; then - - keytable_short="${keytable:0:2}" - echo "KEYMAP=${keytable_short}" > /etc/vconsole.conf - echo "FONT=lat9w-16" >> /etc/vconsole.conf - if [ -f "/etc/conf.d/keymaps" ]; then - sed -i 's/keymap=.*$/keymap=\"'$keytable_short'\"/' /etc/conf.d/keymaps - fi - - sed -e 's|Option "XkbLayout".*$|Option "XkbLayout" "'$keytable_short'"|' -i /etc/X11/xorg.conf.d/20-keyboard.conf - if [ "$keytable_short" != "de" ]; then - sed -e 's| xkb_layout.*$| xkb_layout '$keytable_short',de|' -i /home/${user}/.config/sway/config - fi -fi -# -if cat /proc/cmdline | grep "tz" 1>/dev/null 2>&1; then - - # https://stackoverflow.com/questions/5767062/how-to-check-if-a-symlink-exists - if [ -L /etc/localtime ]; then - rm /etc/localtime - fi - ln -s /usr/share/zoneinfo/"${tz}" /etc/localtime - -fi - -echo "Fertig!!!" - diff --git a/service/startup-script.service b/service/startup-script.service deleted file mode 100755 index 7c435a1..0000000 --- a/service/startup-script.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=startup shell commands for Desktop Graphic-card usw. -Before=display-manager.service - -[Service] -User=root -Type=simple -ExecStart=/usr/bin/startup-script - -[Install] -WantedBy=multi-user.target