From 0548b418ec01d386acfe8e5c6658afcc892456d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jake=20Buchholz=20G=C3=B6kt=C3=BCrk?= <tomalok@gmail.com>
Date: Thu, 7 Nov 2024 16:21:05 +0000
Subject: [PATCH] enact /usr merge

---
 Makefile                               | 30 +++++++++++++-------------
 bin/imds                               |  1 +
 etc/network/interfaces.d/DEFAULT       |  4 ----
 etc/network/interfaces.d/lo            |  4 ----
 lib/tiny-cloud/init                    |  1 +
 lib/tiny-cloud/user-data/alpine-config |  1 +
 sbin/tiny-cloud                        |  1 +
 7 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 etc/network/interfaces.d/DEFAULT
 delete mode 100644 etc/network/interfaces.d/lo

diff --git a/Makefile b/Makefile
index e363182..74e1ab6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PREFIX?=/
+PREFIX ?= /
 
 SUBPACKAGES = core openrc aws azure gcp hetzner incus nocloud oci scaleway
 
@@ -7,20 +7,20 @@ SUBPACKAGES = core openrc aws azure gcp hetzner incus nocloud oci scaleway
 install: $(SUBPACKAGES)
 
 core:
-	install -Dm755 -t "$(PREFIX)"/bin \
+	install -Dm755 -t "$(PREFIX)"/usr/bin \
 		bin/imds
-	install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud \
+	install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud \
 		lib/tiny-cloud/common \
 		lib/tiny-cloud/init \
 		lib/tiny-cloud/tiny-cloud.conf
-	install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud/user-data \
+	install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/user-data \
 		lib/tiny-cloud/user-data/alpine-config \
 		lib/tiny-cloud/user-data/missing \
 		lib/tiny-cloud/user-data/script \
 		lib/tiny-cloud/user-data/unknown
 	install -Dm644 lib/tiny-cloud/tiny-cloud.conf \
 		"$(PREFIX)"/etc/tiny-cloud.conf
-	install -Dm755 -t "$(PREFIX)"/sbin \
+	install -Dm755 -t "$(PREFIX)"/usr/sbin \
 		sbin/tiny-cloud
 
 openrc:
@@ -28,40 +28,40 @@ openrc:
 		dist/openrc/*
 
 aws:
-	install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud/cloud/aws \
+	install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/aws \
 		lib/tiny-cloud/cloud/aws/*
 
 azure:
-	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/azure \
+	install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/azure \
 		lib/tiny-cloud/cloud/azure/*
 
 gcp:
-	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/gcp \
+	install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/gcp \
 		lib/tiny-cloud/cloud/gcp/*
 
 hetzner:
-	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/hetzner \
+	install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/hetzner \
 		lib/tiny-cloud/cloud/hetzner/*
 
 incus:
-	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/incus \
+	install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/incus \
 		lib/tiny-cloud/cloud/incus/imds
-	install -Dm755 -t $(PREFIX)/lib/tiny-cloud/cloud/incus \
+	install -Dm755 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/incus \
 		lib/tiny-cloud/cloud/incus/autodetect
 
 nocloud:
-	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/nocloud \
+	install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/nocloud \
 		lib/tiny-cloud/cloud/nocloud/init \
 		lib/tiny-cloud/cloud/nocloud/imds
-	install -Dm755 -t $(PREFIX)/lib/tiny-cloud/cloud/nocloud \
+	install -Dm755 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/nocloud \
 		lib/tiny-cloud/cloud/nocloud/autodetect
 
 oci:
-	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/oci \
+	install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/oci \
 		lib/tiny-cloud/cloud/oci/*
 
 scaleway:
-	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/scaleway \
+	install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/scaleway \
 		lib/tiny-cloud/cloud/scaleway/*
 
 check: tests/Kyuafile Kyuafile
diff --git a/bin/imds b/bin/imds
index 69a18ad..4512cfc 100755
--- a/bin/imds
+++ b/bin/imds
@@ -5,6 +5,7 @@
 
 ### configuration, common functions
 
+: "${PREFIX:=/usr}"
 : "${LIBDIR:=$PREFIX/lib}"
 . "$LIBDIR/tiny-cloud/common"
 
diff --git a/etc/network/interfaces.d/DEFAULT b/etc/network/interfaces.d/DEFAULT
deleted file mode 100644
index efd2628..0000000
--- a/etc/network/interfaces.d/DEFAULT
+++ /dev/null
@@ -1,4 +0,0 @@
-auto %%
-iface %%
-  use dhcp
-  use imds
diff --git a/etc/network/interfaces.d/lo b/etc/network/interfaces.d/lo
deleted file mode 100644
index f5f6dfb..0000000
--- a/etc/network/interfaces.d/lo
+++ /dev/null
@@ -1,4 +0,0 @@
-auto lo
-iface lo
-  use link
-  use loopback
diff --git a/lib/tiny-cloud/init b/lib/tiny-cloud/init
index 57fa18d..a3e99f4 100644
--- a/lib/tiny-cloud/init
+++ b/lib/tiny-cloud/init
@@ -3,6 +3,7 @@
 # shellcheck shell=sh
 
 # set defaults
+: "${PREFIX:=/usr}"
 : "${LIBDIR:=$PREFIX/lib}"
 . "$LIBDIR/tiny-cloud/common"
 
diff --git a/lib/tiny-cloud/user-data/alpine-config b/lib/tiny-cloud/user-data/alpine-config
index d4e1cfe..606b7e4 100644
--- a/lib/tiny-cloud/user-data/alpine-config
+++ b/lib/tiny-cloud/user-data/alpine-config
@@ -4,6 +4,7 @@
 
 # NOTE: alpine-config extends cloud-config
 
+: "${PREFIX:=/usr}"
 : "${LIBDIR:=$PREFIX/lib}"
 . "${LIBDIR}/tiny-cloud/user-data/cloud-config"
 
diff --git a/sbin/tiny-cloud b/sbin/tiny-cloud
index db442b3..48c813e 100755
--- a/sbin/tiny-cloud
+++ b/sbin/tiny-cloud
@@ -5,6 +5,7 @@
 
 set -e
 
+: "${PREFIX:=/usr}"
 : "${LIBDIR:=$PREFIX/lib}"
 . "$LIBDIR/tiny-cloud/common"