Merge e0d8f58995d58e4bcd337e80e37ba1ebe29558a2 into a0745c836a89c7776bf27dfbe5a8c9a0a9aec28b

Merge pull request #62 from gibmat/fix-alpine-template
Fix alpine template
2025-08-21 04:10:55 +00:00 · 2024-01-30 11:48:33 +08:00 · 2024-01-27 17:19:39 +01:00 · 2024-01-27 17:18:45 +01:00 · 2024-01-27 16:11:20 +00:00 · 2024-01-27 15:19:58 +00:00
3 changed files with 8 additions and 6 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -10,9 +10,5 @@ EXTRA_DIST = \
 	CONTRIBUTING \
 	MAINTAINERS

-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(LXCPATH)
-	$(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc
-
 ChangeLog::
 	@touch ChangeLog
--- a/templates/lxc-alpine.in
+++ b/templates/lxc-alpine.in
@ -294,7 +294,6 @@ make_dev_nodes() {

 	mknod -m 666 dev/tty c 5 0
 	chown 0:5 dev/tty  # root:tty
-	mknod -m 620 dev/console c 5 1
 	mknod -m 666 dev/ptmx c 5 2
 	chown 0:5 dev/ptmx  # root:tty
 }
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@ -367,12 +367,19 @@ download_debian()
        iproute=iproute2
        ;;
    esac
+    if [ `apt search dialog |grep ^dialog\/ |wc -l` != 0 ]; then
+        dialoglike="dialog"
+    elif [ `apt search whiptail |grep ^whiptail\/ |wc -l` != 0 ]; then
+        dialoglike="whiptail"
+    elif [ `apt search Xdialog |grep ^Xdialog\/ |wc -l` != 0 ]; then
+        dialoglike="Xdialog"
+    fi
    packages=\
 $init,\
 ifupdown,\
 locales,\
 ca-certificates,\
-dialog,\
+$dialoglike,\
 isc-dhcp-client,\
 netbase,\
 net-tools,\
Author	SHA1	Message	Date
zhaixiaojuan@loongson.cn	5af60f83ca	Merge e0d8f58995d58e4bcd337e80e37ba1ebe29558a2 into a0745c836a89c7776bf27dfbe5a8c9a0a9aec28b	2024-01-30 11:48:33 +08:00
Stéphane Graber	a0745c836a	Merge pull request #62 from gibmat/fix-alpine-template Fix alpine template	2024-01-27 17:19:39 +01:00
Stéphane Graber	e2a8bfc5e6	Merge pull request #61 from gibmat/dont-install-empty-dirs Don't install empty directories	2024-01-27 17:18:45 +01:00
Mathias Gibbens	9c720dd77b	Fix alpine template On a Debian sid system with lxc 5.0.3 and the latest snapshot of lxc-templates, attempting to create an alpine container fails with the error "mknod: dev/console: File exists". This had been reported a while back in Debian bug #998095 and partially addressed in #46. I performed some testing of the resulting alpine container, and things appear to be working correctly. Signed-off-by: Mathias Gibbens <gibmat@debian.org>	2024-01-27 16:11:20 +00:00
Mathias Gibbens	7bf3e4506b	Don't install empty directories I think this is leftover from when lxc-templates was split out from lxc. There's no need to install empty directories /var/cache/lxc/ and /var/lib/lxc/. Signed-off-by: Mathias Gibbens <gibmat@debian.org>	2024-01-27 15:19:58 +00:00
zhaixiaojuan	e0d8f58995	lxc-debian: support installation of dialog-like program	2023-10-31 15:06:23 +08:00