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

various changes related to installer and images

Browse Source
This commit is contained in:
Bruce Leidl 2018-12-31 18:39:55 -05:00
parent cbaad85617
commit 97385889a3
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@ SRC_URI = "\
file://share/dot.vimrc \ file://share/dot.vimrc \
file://polkit/citadel.rules \ file://polkit/citadel.rules \
file://systemd/zram-swap.service \ file://systemd/zram-swap.service \
file://citadel/citadel-image.conf \
${DEFAULT_REALM_UNITS} \ ${DEFAULT_REALM_UNITS} \
${MODPROBE_CONFIG} \ ${MODPROBE_CONFIG} \
${SYSCTL_CONFIG} \ ${SYSCTL_CONFIG} \
@ -70,6 +71,7 @@ do_install() {
install -m 0755 -d ${D}${sysconfdir}/NetworkManager install -m 0755 -d ${D}${sysconfdir}/NetworkManager
install -m 0755 -d ${D}${sysconfdir}/polkit-1/rules.d install -m 0755 -d ${D}${sysconfdir}/polkit-1/rules.d
install -m 0755 -d ${D}${sysconfdir}/modprobe.d install -m 0755 -d ${D}${sysconfdir}/modprobe.d
install -m 0755 -d ${D}${datadir}/citadel
install -m 0700 -d ${D}${localstatedir}/lib/NetworkManager install -m 0700 -d ${D}${localstatedir}/lib/NetworkManager
install -m 0700 -d ${D}${localstatedir}/lib/NetworkManager/system-connections install -m 0700 -d ${D}${localstatedir}/lib/NetworkManager/system-connections
@ -107,9 +109,31 @@ do_install() {
install -m 0644 ${WORKDIR}/modprobe.d/audio_powersave.conf ${D}${sysconfdir}/modprobe.d/ install -m 0644 ${WORKDIR}/modprobe.d/audio_powersave.conf ${D}${sysconfdir}/modprobe.d/
install -m 0644 ${S}/citadel/citadel-image.conf ${D}${datadir}/citadel
# This probably belongs in lvm2 recipe
install -d ${D}${systemd_system_unitdir}/sysinit.target.wants
ln -s ../lvm2-lvmetad.socket ${D}${systemd_system_unitdir}/sysinit.target.wants/lvm2-lvmetad.socket
ln -s /storage/citadel-state/resolv.conf ${D}${sysconfdir}/resolv.conf ln -s /storage/citadel-state/resolv.conf ${D}${sysconfdir}/resolv.conf
ln -s /dev/null ${D}${sysconfdir}/tmpfiles.d/etc.conf ln -s /dev/null ${D}${sysconfdir}/tmpfiles.d/etc.conf
ln -s /dev/null ${D}${sysconfdir}/tmpfiles.d/home.conf ln -s /dev/null ${D}${sysconfdir}/tmpfiles.d/home.conf
install -d ${D}${datadir}/themes
install -d ${D}${datadir}/icons
install -d ${D}${libdir}/modules
install -d ${D}${libdir}/firmware
install -d ${D}${datadir}/backgrounds
install -d ${D}/opt/share
ln -sf /opt/share/themes/Adapta ${D}/usr/share/themes/Adapta
ln -sf /opt/share/themes/Adapta-Eta ${D}/usr/share/themes/Adapta-Eta
ln -sf /opt/share/themes/Adapta-Nokto ${D}/usr/share/themes/Adapta-Nokto
ln -sf /opt/share/themes/Adapta-Nokto-Eta ${D}/usr/share/themes/Adapta-Nokto-Eta
ln -sf /opt/share/icons/Paper ${D}/usr/share/icons/Paper
ln -sf /opt/share/icons/Adwaita ${D}/usr/share/icons/Adwaita
ln -sf /opt/share/backgrounds/gnome ${D}/usr/share/backgrounds/gnome
ln -sf /opt/share/gnome-background-properties ${D}/usr/share/gnome-background-properties
} }
FILES_${PN} = "/" FILES_${PN} = "/"

4
meta-citadel/recipes-citadel/citadel-config/files/citadel/citadel-image.conf Normal file
View File

@ -0,0 +1,4 @@
[channel.testing]
update_server = ""
pubkey = "2adc094a709bb3f81f9b311dbd702b1d5598be8e80e2afac3b4e4eb66bbf82a4"
keypair = "27e8068b7daae47b1be878326259cb77b267b1214becd42cbe501f02e3fb7dc72adc094a709bb3f81f9b311dbd702b1d5598be8e80e2afac3b4e4eb66bbf82a4"

1
meta-citadel/recipes-citadel/citadel-config/files/fstab
View File

@ -1,4 +1,3 @@
/dev/root / auto defaults 1 1
/dev/mapper/citadel-storage /storage auto defaults,nossd,noatime,commit=120 0 0 /dev/mapper/citadel-storage /storage auto defaults,nossd,noatime,commit=120 0 0
/storage/citadel-state/var /var none bind 0 0 /storage/citadel-state/var /var none bind 0 0
/storage/realms /realms none bind 0 0 /storage/realms /realms none bind 0 0

2
meta-citadel/recipes-citadel/citadel-config/files/systemd/launch-default-realm.service
View File

@ -1,6 +1,8 @@
[Unit] [Unit]
Description=Launch default realm Description=Launch default realm
ConditionPathExists=!/run/realms ConditionPathExists=!/run/realms
ConditionPathExists=/realms/default.realm
[Service] [Service]
ExecStart=/usr/bin/realms start ExecStart=/usr/bin/realms start