Update Buildroot to 2019.02.3 (#415)
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
This commit is contained in:
@@ -0,0 +1 @@
|
||||
/usr/lib/systemd/system/hassos-overlay.service
|
||||
@@ -1,2 +0,0 @@
|
||||
C /mnt/overlay/etc/hostname - - - - /etc/hostname
|
||||
C /mnt/overlay/etc/hosts - - - - /etc/hosts
|
||||
@@ -1,4 +1,3 @@
|
||||
# Cleanup lease files
|
||||
e /var/lib/NetworkManager/*.lease - - - 14d
|
||||
C /mnt/overlay/etc/NetworkManager/system-connections - - - - /usr/share/system-connections
|
||||
f /run/resolv.conf - - - -
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
C /mnt/overlay/etc/systemd/timesyncd.conf - - - - /etc/systemd/timesyncd.conf
|
||||
@@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=NetworkManager persistent system connections
|
||||
Requires=mnt-overlay.mount
|
||||
After=mnt-overlay.mount systemd-tmpfiles-setup.service
|
||||
After=mnt-overlay.mount hassos-overlay.service
|
||||
Before=NetworkManager.service hassos-config.service
|
||||
|
||||
[Mount]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=Hostname persistent configuration
|
||||
Requires=mnt-overlay.mount
|
||||
After=mnt-overlay.mount systemd-tmpfiles-setup.service
|
||||
After=mnt-overlay.mount hassos-overlay.service
|
||||
Before=network.target
|
||||
|
||||
[Mount]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=Hosts persistent configuration
|
||||
Requires=mnt-overlay.mount
|
||||
After=mnt-overlay.mount systemd-tmpfiles-setup.service
|
||||
After=mnt-overlay.mount hassos-overlay.service
|
||||
Before=network.target
|
||||
|
||||
[Mount]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=Timesyncd persistent configuration
|
||||
Requires=mnt-overlay.mount
|
||||
After=mnt-overlay.mount systemd-tmpfiles-setup.service
|
||||
After=mnt-overlay.mount hassos-overlay.service
|
||||
Before=systemd-timesyncd.service
|
||||
|
||||
[Mount]
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
[Unit]
|
||||
Description=HassOS overlay targets
|
||||
Documentation=man:systemd.target(5)
|
||||
After=local-fs.target
|
||||
Before=sysinit.target
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
[Unit]
|
||||
Description=HassOS overlay setup
|
||||
DefaultDependencies=no
|
||||
RefuseManualStart=true
|
||||
RefuseManualStop=true
|
||||
Before=hassos-bind.target
|
||||
After=mnt-overlay.mount
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/libexec/hassos-overlay
|
||||
RemainAfterExit=true
|
||||
|
||||
[Install]
|
||||
WantedBy=local-fs.target
|
||||
@@ -1,8 +1,7 @@
|
||||
[Unit]
|
||||
Description=HassOS boot partition
|
||||
DefaultDependencies=no
|
||||
Before=umount.target
|
||||
After=local-fs.target
|
||||
Before=umount.target local-fs.target
|
||||
Conflicts=umount.target
|
||||
|
||||
[Mount]
|
||||
|
||||
@@ -3,7 +3,7 @@ Description=HassOS data partition
|
||||
Wants=hassos-expand.service
|
||||
DefaultDependencies=no
|
||||
After=hassos-expand.service
|
||||
Before=umount.target systemd-tmpfiles-setup.service
|
||||
Before=umount.target local-fs.target
|
||||
Conflicts=umount.target
|
||||
|
||||
[Mount]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=HassOS overlay partition
|
||||
DefaultDependencies=no
|
||||
Before=umount.target systemd-tmpfiles-setup.service
|
||||
Before=umount.target local-fs.target
|
||||
Conflicts=umount.target
|
||||
|
||||
[Mount]
|
||||
|
||||
24
buildroot-external/rootfs-overlay/usr/libexec/hassos-overlay
Executable file
24
buildroot-external/rootfs-overlay/usr/libexec/hassos-overlay
Executable file
@@ -0,0 +1,24 @@
|
||||
#!/bin/sh
|
||||
|
||||
mkdir -p /mnt/overlay/etc/
|
||||
|
||||
# Network
|
||||
if [ ! -d /mnt/overlay/etc/NetworkManager/system-connections ]; then
|
||||
mkdir -p /mnt/overlay/etc/NetworkManager/system-connections
|
||||
cp -fp /etc/NetworkManager/system-connections/* /mnt/overlay/etc/NetworkManager/system-connections/
|
||||
chmod 600 /mnt/overlay/etc/NetworkManager/system-connections/*
|
||||
fi
|
||||
|
||||
if [ ! -f /mnt/overlay/etc/hostname ]; then
|
||||
cp -fp /etc/hostname /mnt/overlay/etc/hostname
|
||||
fi
|
||||
|
||||
if [ ! -f /mnt/overlay/etc/hosts ]; then
|
||||
cp -fp /etc/hosts /mnt/overlay/etc/hosts
|
||||
fi
|
||||
|
||||
# TimeSync
|
||||
if [ ! -f /mnt/overlay/etc/systemd/timesyncd.conf ]; then
|
||||
mkdir -p /mnt/overlay/etc/systemd
|
||||
cp -fp /etc/systemd/timesyncd.conf /mnt/overlay/etc/systemd/timesyncd.conf
|
||||
fi
|
||||
Reference in New Issue
Block a user