jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-29 16:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Layering hostname/hosts (#5)

Browse Source 
* Layering hostname/hosts

* Fix build

* Use origin files on new overlay
This commit is contained in:
Pascal Vizeli 2018-04-27 18:20:06 +02:00 committed by GitHub
parent 5a6b8c5bbe
commit e544c14d3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildroot-external/package/hassio/builder/hostapp.sh
View File

@ -55,11 +55,11 @@ mkdir -p /mnt/supervisor
mkdir -p /mnt/cli mkdir -p /mnt/cli
# Run dockerd # Run dockerd
dockerd -s overlay2 -g /mnt/docker 2> /dev/null & dockerd -s overlay2 -g /mnt/docker &
DOCKER_PID=$! DOCKER_PID=$!
until docker info >/dev/null 2>&1; do
DOCKER_COUNT=0 DOCKER_COUNT=0
until docker info >/dev/null 2>&1; do
if [ ${DOCKER_COUNT} -gt 30 ]; then if [ ${DOCKER_COUNT} -gt 30 ]; then
exit 1 exit 1
fi fi

1
buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-hostname.mount Symbolic link
View File

@ -0,0 +1 @@
/usr/lib/systemd/system/etc-hostname.mount

1
buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-hosts.mount Symbolic link
View File

@ -0,0 +1 @@
/usr/lib/systemd/system/etc-hosts.mount

2
buildroot-external/rootfs-overlay/etc/tmpfiles.d/hostname.conf Normal file
View File

@ -0,0 +1,2 @@
C /mnt/overlay/etc/hostname - - - - /etc/hostname
C /mnt/overlay/etc/hosts - - - - /etc/hosts

14
buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hostname.mount Normal file
View File

@ -0,0 +1,14 @@
[Unit]
Description=Hostname persistent configuration
Requires=mnt-overlay.mount
After=mnt-overlay.mount systemd-tmpfiles-setup.service
Before=network.target
[Mount]
What=/mnt/overlay/etc/hostname
Where=/etc/hostname
Type=none
Options=bind
[Install]
WantedBy=hassio-bind.target

14
buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hosts.mount Normal file
View File

@ -0,0 +1,14 @@
[Unit]
Description=Hosts persistent configuration
Requires=mnt-overlay.mount
After=mnt-overlay.mount systemd-tmpfiles-setup.service
Before=network.target
[Mount]
What=/mnt/overlay/etc/hosts
Where=/etc/hosts
Type=none
Options=bind
[Install]
WantedBy=hassio-bind.target

2
buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount
View File

@ -1,7 +1,7 @@
[Unit] [Unit]
Description=Hassio overlay partition Description=Hassio overlay partition
DefaultDependencies=no DefaultDependencies=no
Before=umount.target Before=umount.target systemd-tmpfiles-setup.service
Conflicts=umount.target Conflicts=umount.target
[Mount] [Mount]

1
scripts/enter.sh
View File

@ -1,3 +1,4 @@
#!/bin/bash #!/bin/bash
modprobe overlayfs
docker build -t hassbuildroot . docker build -t hassbuildroot .
docker run -it --rm --privileged -v "$(pwd):/build" hassbuildroot bash docker run -it --rm --privileged -v "$(pwd):/build" hassbuildroot bash