From 86d76356d4bf803866c531538823c612c7f31e39 Mon Sep 17 00:00:00 2001 From: Nishal Kulkarni Date: Sat, 20 Mar 2021 12:45:26 +0530 Subject: [PATCH] Switched to Network Manager --- .../etc/NetworkManager/NetworkManager.conf | 5 ++ iso/airootfs/etc/group | 18 +++- iso/airootfs/etc/hostname | 2 - iso/airootfs/etc/mkinitcpio.conf | 4 +- iso/airootfs/etc/motd | 9 -- iso/airootfs/etc/resolv.conf | 1 - .../etc/systemd/network/20-ethernet.network | 13 --- .../etc/systemd/network/20-wireless.network | 13 --- .../bluetooth.target.wants/bluetooth.service | 1 + .../cloud-config.service | 1 - .../cloud-final.service | 1 - .../cloud-init-local.service | 1 - .../cloud-init.service | 1 - .../etc/systemd/system/dbus-org.bluez.service | 1 + .../system/dbus-org.freedesktop.Avahi.service | 1 + .../dbus-org.freedesktop.network1.service | 1 - ...dbus-org.freedesktop.nm-dispatcher.service | 1 + .../dbus-org.freedesktop.resolve1.service | 1 - .../etc/systemd/system/default.target | 1 + .../NetworkManager.service | 1 + .../avahi-daemon.service | 1 + .../multi-user.target.wants/iwd.service | 1 - .../livecd-talk.service | 1 - .../multi-user.target.wants/ntpd.service | 1 + .../systemd-networkd.service | 1 - .../systemd-resolved.service | 1 - .../NetworkManager-wait-online.service | 1 + .../systemd-networkd-wait-online.service | 1 - .../sockets.target.wants/avahi-daemon.socket | 1 + .../systemd-networkd.socket | 1 - .../sysinit.target.wants/haveged.service | 1 + .../wait-for-only-one-interface.conf | 6 -- .../local/share/livecd-sound/asound.conf.in | 3 - iso/packages.x86_64 | 86 ++++++++++++++++--- 34 files changed, 107 insertions(+), 76 deletions(-) create mode 100644 iso/airootfs/etc/NetworkManager/NetworkManager.conf delete mode 100644 iso/airootfs/etc/motd delete mode 120000 iso/airootfs/etc/resolv.conf delete mode 100644 iso/airootfs/etc/systemd/network/20-ethernet.network delete mode 100644 iso/airootfs/etc/systemd/network/20-wireless.network create mode 120000 iso/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service delete mode 120000 iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service delete mode 120000 iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service delete mode 120000 iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service delete mode 120000 iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service create mode 120000 iso/airootfs/etc/systemd/system/dbus-org.bluez.service create mode 120000 iso/airootfs/etc/systemd/system/dbus-org.freedesktop.Avahi.service delete mode 120000 iso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service create mode 120000 iso/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service delete mode 120000 iso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service create mode 120000 iso/airootfs/etc/systemd/system/default.target create mode 120000 iso/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service create mode 120000 iso/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service delete mode 120000 iso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service delete mode 120000 iso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service create mode 120000 iso/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service delete mode 120000 iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service delete mode 120000 iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service create mode 120000 iso/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service delete mode 120000 iso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service create mode 120000 iso/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket delete mode 120000 iso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket create mode 120000 iso/airootfs/etc/systemd/system/sysinit.target.wants/haveged.service delete mode 100644 iso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf delete mode 100644 iso/airootfs/usr/local/share/livecd-sound/asound.conf.in diff --git a/iso/airootfs/etc/NetworkManager/NetworkManager.conf b/iso/airootfs/etc/NetworkManager/NetworkManager.conf new file mode 100644 index 0000000..eed717a --- /dev/null +++ b/iso/airootfs/etc/NetworkManager/NetworkManager.conf @@ -0,0 +1,5 @@ +# Configuration file for NetworkManager. +# See "man 5 NetworkManager.conf" for details. + +[device] +wifi.scan-rand-mac-address=no diff --git a/iso/airootfs/etc/group b/iso/airootfs/etc/group index 126bec8..ed7ceed 100644 --- a/iso/airootfs/etc/group +++ b/iso/airootfs/etc/group @@ -1,6 +1,16 @@ root:x:0:root -adm:x:4:liveuser -wheel:x:10:liveuser -uucp:x:14:liveuser -autologin:x:18:liveuser +sys:x:3:bin,liveuser +network:x:90:liveuser +power:x:98:liveuser +adm:x:999:liveuser +wheel:x:998:liveuser +uucp:x:987:liveuser +optical:x:990:liveuser +rfkill:x:983:liveuser +video:x:986:liveuser +storage:x:988:liveuser +audio:x:995:liveuser +users:x:985:liveuser +nopasswdlogin:x:966:liveuser +autologin:x:967:liveuser liveuser:x:1000: diff --git a/iso/airootfs/etc/hostname b/iso/airootfs/etc/hostname index 40df690..4c4301f 100644 --- a/iso/airootfs/etc/hostname +++ b/iso/airootfs/etc/hostname @@ -1,3 +1 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later Arcadia diff --git a/iso/airootfs/etc/mkinitcpio.conf b/iso/airootfs/etc/mkinitcpio.conf index c37b19f..8852fd3 100644 --- a/iso/airootfs/etc/mkinitcpio.conf +++ b/iso/airootfs/etc/mkinitcpio.conf @@ -60,10 +60,10 @@ HOOKS=(base udev modconf memdisk archiso_shutdown archiso archiso_loop_mnt archi #COMPRESSION="gzip" #COMPRESSION="bzip2" #COMPRESSION="lzma" -COMPRESSION="xz" +#COMPRESSION="xz" #COMPRESSION="lzop" #COMPRESSION="lz4" -#COMPRESSION="zstd" +COMPRESSION="zstd" # COMPRESSION_OPTIONS # Additional options for the compressor diff --git a/iso/airootfs/etc/motd b/iso/airootfs/etc/motd deleted file mode 100644 index 417b050..0000000 --- a/iso/airootfs/etc/motd +++ /dev/null @@ -1,9 +0,0 @@ -To install Arch Linux follow the installation guide: -https://wiki.archlinux.org/index.php/Installation_guide - -For Wi-Fi, authenticate to the wireless network using the iwctl utility. -Ethernet and Wi-Fi connections using DHCP should work automatically. - -After connecting to the internet, the installation guide can be accessed -via the convenience script Installation_guide. - diff --git a/iso/airootfs/etc/resolv.conf b/iso/airootfs/etc/resolv.conf deleted file mode 120000 index 3639662..0000000 --- a/iso/airootfs/etc/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -/run/systemd/resolve/stub-resolv.conf \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/network/20-ethernet.network b/iso/airootfs/etc/systemd/network/20-ethernet.network deleted file mode 100644 index efa309c..0000000 --- a/iso/airootfs/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/iso/airootfs/etc/systemd/network/20-wireless.network b/iso/airootfs/etc/systemd/network/20-wireless.network deleted file mode 100644 index bf9ab9d..0000000 --- a/iso/airootfs/etc/systemd/network/20-wireless.network +++ /dev/null @@ -1,13 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -[Match] -Name=wlp* -Name=wlan* - -[Network] -DHCP=yes -IPv6PrivacyExtensions=yes - -[DHCP] -RouteMetric=1024 diff --git a/iso/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service b/iso/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service new file mode 120000 index 0000000..d256bfe --- /dev/null +++ b/iso/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/bluetooth.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service b/iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service deleted file mode 120000 index ebc50f0..0000000 --- a/iso/airootfs/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/iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service b/iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service deleted file mode 120000 index 80fa3c8..0000000 --- a/iso/airootfs/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/iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service b/iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service deleted file mode 120000 index dd8e9f1..0000000 --- a/iso/airootfs/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/iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service deleted file mode 120000 index 24c7a26..0000000 --- a/iso/airootfs/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/iso/airootfs/etc/systemd/system/dbus-org.bluez.service b/iso/airootfs/etc/systemd/system/dbus-org.bluez.service new file mode 120000 index 0000000..d256bfe --- /dev/null +++ b/iso/airootfs/etc/systemd/system/dbus-org.bluez.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/bluetooth.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.Avahi.service b/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.Avahi.service new file mode 120000 index 0000000..e7ae405 --- /dev/null +++ b/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.Avahi.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/avahi-daemon.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service b/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service deleted file mode 120000 index 4c158e6..0000000 --- a/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-networkd.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service b/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service new file mode 120000 index 0000000..a7e5cd4 --- /dev/null +++ b/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/NetworkManager-dispatcher.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service b/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service deleted file mode 120000 index 4f6ae34..0000000 --- a/iso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-resolved.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/default.target b/iso/airootfs/etc/systemd/system/default.target new file mode 120000 index 0000000..cf9fa51 --- /dev/null +++ b/iso/airootfs/etc/systemd/system/default.target @@ -0,0 +1 @@ +/usr/lib/systemd/system/graphical.target \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service new file mode 120000 index 0000000..e874a9b --- /dev/null +++ b/iso/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/NetworkManager.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service new file mode 120000 index 0000000..e7ae405 --- /dev/null +++ b/iso/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/avahi-daemon.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service deleted file mode 120000 index 3625abd..0000000 --- a/iso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/iwd.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service deleted file mode 120000 index b917481..0000000 --- a/iso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/livecd-talk.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service new file mode 120000 index 0000000..d3bfc72 --- /dev/null +++ b/iso/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/ntpd.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service deleted file mode 120000 index 4c158e6..0000000 --- a/iso/airootfs/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/iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service b/iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service deleted file mode 120000 index 4f6ae34..0000000 --- a/iso/airootfs/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/iso/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service b/iso/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service new file mode 120000 index 0000000..b78b586 --- /dev/null +++ b/iso/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/NetworkManager-wait-online.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/iso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service deleted file mode 120000 index 7d6ad92..0000000 --- a/iso/airootfs/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/iso/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket b/iso/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket new file mode 120000 index 0000000..045b23d --- /dev/null +++ b/iso/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket @@ -0,0 +1 @@ +/usr/lib/systemd/system/avahi-daemon.socket \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/iso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket deleted file mode 120000 index 51942c8..0000000 --- a/iso/airootfs/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/iso/airootfs/etc/systemd/system/sysinit.target.wants/haveged.service b/iso/airootfs/etc/systemd/system/sysinit.target.wants/haveged.service new file mode 120000 index 0000000..546834f --- /dev/null +++ b/iso/airootfs/etc/systemd/system/sysinit.target.wants/haveged.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/haveged.service \ No newline at end of file diff --git a/iso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/iso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf deleted file mode 100644 index 1b4c091..0000000 --- a/iso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf +++ /dev/null @@ -1,6 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -[Service] -ExecStart= -ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any diff --git a/iso/airootfs/usr/local/share/livecd-sound/asound.conf.in b/iso/airootfs/usr/local/share/livecd-sound/asound.conf.in deleted file mode 100644 index 3f9c7aa..0000000 --- a/iso/airootfs/usr/local/share/livecd-sound/asound.conf.in +++ /dev/null @@ -1,3 +0,0 @@ -Defaults node -defaults.ctl.card %card%; -defaults.pcm.card %card%; diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index 4354f41..fa9444f 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -13,10 +13,12 @@ crda darkhttpd ddrescue dhclient -dhcpcd +#dhcpcd +dialog diffutils dmraid dnsmasq +dnsutils dosfstools edk2-shell efibootmgr @@ -37,15 +39,16 @@ intel-ucode ipw2100-fw ipw2200-fw irssi -iwd +#iwd jfsutils -kitty-terminfo +#kitty-terminfo lftp linux-zen linux-zen-headers linux-atm linux-firmware #livecd-sounds +logrotate lsscsi lvm2 lynx @@ -66,6 +69,7 @@ nilfs-utils nmap ntfs-3g nvme-cli +ntp openconnect openssh openvpn @@ -78,17 +82,17 @@ reflector reiserfsprogs rp-pppoe rsync -rxvt-unicode-terminfo +#rxvt-unicode-terminfo sdparm sg3_utils smartmontools squashfs-tools sudo syslinux -systemd-resolvconf +#systemd-resolvconf tcpdump terminus-font -termite-terminfo +#termite-terminfo testdisk tmux udftools @@ -102,18 +106,67 @@ wpa_supplicant wvdial xfsprogs xl2tpd + +#SH zsh +zsh-completions +zsh-syntax-highlighting -#ARCADIA +#OS grub arcadia-grub-config os-prober +base base-devel xdg-user-dirs +cryptsetup + +#Video +mesa + +#Audio +alsa-firmware +alsa-plugins +alsa-lib +alsa-utils +gst-libav +gst-plugins-bad +gst-plugins-base +gst-plugins-good +gst-plugins-ugly +gstreamer +libdvdcss +pulseaudio +pulseaudio-alsa +pavucontrol + +#Bluetooth +blueberry +bluez +bluez-libs +bluez-utils +pulseaudio-bluetooth + +#Network +avahi +nss-mdns +mobile-broadband-provider-info +modemmanager +networkmanager +network-manager-applet +networkmanager-openconnect +networkmanager-openvpn +networkmanager-pptp +networkmanager-vpnc +openresolv #DE xorg +xorg-server +xorg-apps +xorg-xinit xfce4 +#picom lightdm lightdm-gtk-greeter @@ -121,16 +174,27 @@ lightdm-gtk-greeter calamares arcadia-calamares-config -#Random +#Internet git -neofetch -feh +firefox +wget + +#Utilities +iw brightnessctl bash-completion gparted - +scrot +vlc +p7zip +unrar +unzip yay-bin +#Fancy +neofetch +feh + ###fonts adobe-source-sans-pro-fonts awesome-terminal-fonts