brl/citadel
1
0
Fork 2
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Fix failure of dns resolution in realms #14

Merged
brl merged 1 commits from isa/citadel:resolvconf into master 2024-09-09 08:23:36 -04:00
Conversation 0 Commits 1 Files Changed 4 +6 -21
4 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0d13ca38df - Show all commits

9
meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.path
View File

@ -1,9 +0,0 @@
[Unit]
Description=Watch /run/NetworkManager
[Path]
PathChanged=/run/NetworkManager
MakeDirectory=true
[Install]
WantedBy=multi-user.target

7
meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.service
View File

@ -1,7 +0,0 @@
[Unit]
Description=Copy resolv.conf to /storage/citadel-state
ConditionPathExists=/run/NetworkManager/resolv.conf
ConditionPathExists=/storage/citadel-state
[Service]
Type=oneshot
ExecStart=/bin/cp /run/NetworkManager/resolv.conf /storage/citadel-state/resolv.conf

4
meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend
View File

@ -3,16 +3,12 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/networkmanager:"
SRC_URI += "\ SRC_URI += "\
file://NetworkManager.conf \ file://NetworkManager.conf \
file://watch-resolvconf.path \
file://watch-resolvconf.service \
" "
SYSTEMD_SERVICE:${PN} += "watch-resolvconf.path" SYSTEMD_SERVICE:${PN} += "watch-resolvconf.path"
do_install:append() { do_install:append() {
install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/ install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/
install -m 644 ${WORKDIR}/watch-resolvconf.path ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/watch-resolvconf.service ${D}${systemd_system_unitdir}
} }
PACKAGECONFIG = "nss systemd polkit wifi iwd vala nmcli bluez5" PACKAGECONFIG = "nss systemd polkit wifi iwd vala nmcli bluez5"
NETWORKMANAGER_FIREWALL_DEFAULT = "iptables" NETWORKMANAGER_FIREWALL_DEFAULT = "iptables"

7
meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
View File

@ -52,6 +52,8 @@ SRC_URI = "\
file://systemd/installer-session-switcher.service \ file://systemd/installer-session-switcher.service \
file://systemd/user/gnome-session@citadel-installer.target.d/session.conf \ file://systemd/user/gnome-session@citadel-installer.target.d/session.conf \
file://icons/citadel-installer.svg \ file://icons/citadel-installer.svg \
file://systemd/watch-resolvconf.service \
file://systemd/watch-resolvconf.path \
file://skel/profile \ file://skel/profile \
file://skel/bashrc \ file://skel/bashrc \
file://skel/vimrc \ file://skel/vimrc \
@ -76,7 +78,7 @@ RDEPENDS:${PN} = "bash"
inherit allarch systemd useradd inherit allarch systemd useradd
SYSTEMD_SERVICE:${PN} = "zram-swap.service citadel-launch-default-realm.path x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service citadel-setpassword.service" SYSTEMD_SERVICE:${PN} = "zram-swap.service citadel-launch-default-realm.path x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service citadel-setpassword.service watch-resolvconf.service watch-resolvconf.path"
do_install() { do_install() {
install -m 0755 -d ${D}/storage install -m 0755 -d ${D}/storage
@ -120,6 +122,9 @@ do_install() {
install -m 644 ${WORKDIR}/systemd/citadel-installer-backend.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/systemd/citadel-installer-backend.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/systemd/installer-session-switcher.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/systemd/installer-session-switcher.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/systemd/watch-resolvconf.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/systemd/watch-resolvconf.path ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/systemd/citadel-setpassword.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/systemd/citadel-setpassword.service ${D}${systemd_system_unitdir}
install -m 0754 ${WORKDIR}/citadel-setpassword.sh ${D}${libexecdir} install -m 0754 ${WORKDIR}/citadel-setpassword.sh ${D}${libexecdir}
install -d ${D}${systemd_user_unitdir}/gnome-session@citadel-installer.target.d install -d ${D}${systemd_user_unitdir}/gnome-session@citadel-installer.target.d