diff options
| author | Dave Eddy <dave@daveeddy.com> | 2020-04-07 18:28:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 18:28:20 -0400 |
| commit | 4fc8237742a380d4833394892fb148e1a34acb28 (patch) | |
| tree | 25700bb69fe3d364d5550d1a21dae621bb49a631 | |
| parent | cb1f21263e5283c3502e718042f50eeef6ced5bb (diff) | |
| download | illumos-joyent-4fc8237742a380d4833394892fb148e1a34acb28.tar.gz | |
OS-8156 lx void linux image support (#284)
Reviewed by: Mike Zeller <mike.zeller@joyent.com>
Approved by: Jason King <jason.king@joyent.com>
| -rw-r--r-- | manifest | 3 | ||||
| -rw-r--r-- | usr/src/lib/brand/lx/zone/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/brand/lx/zone/lx_boot.ksh | 4 | ||||
| -rwxr-xr-x | usr/src/lib/brand/lx/zone/lx_boot_zone_void.ksh | 17 |
4 files changed, 24 insertions, 3 deletions
@@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2019 Joyent, Inc. +# Copyright 2020 Joyent, Inc. # Copyright 2017 ASS-Einrichtungssysteme GmbH # # This lists all the files that illumos-joyent delivers as part of a build. @@ -5553,6 +5553,7 @@ f usr/lib/brand/lx/lx_boot_zone_docker 0755 root root f usr/lib/brand/lx/lx_boot_zone_redhat 0755 root root f usr/lib/brand/lx/lx_boot_zone_suse 0755 root root f usr/lib/brand/lx/lx_boot_zone_ubuntu 0755 root root +f usr/lib/brand/lx/lx_boot_zone_void 0755 root root f usr/lib/brand/lx/lx_install 0755 root root f usr/lib/brand/lx/lx_librtld_db.so.1 0755 root root f usr/lib/brand/lx/lx_lockd 0755 root root diff --git a/usr/src/lib/brand/lx/zone/Makefile b/usr/src/lib/brand/lx/zone/Makefile index 58a5723c5d..f5ce1579c7 100644 --- a/usr/src/lib/brand/lx/zone/Makefile +++ b/usr/src/lib/brand/lx/zone/Makefile @@ -21,13 +21,14 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Copyright 2019 Joyent, Inc. +# Copyright 2020 Joyent, Inc. # Copyright 2017 ASS-Einrichtungssysteme GmbH, Inc. All rights reserved. # PROGS = lx_boot lx_install lx_uninstall prestate poststate statechange PROGS += lx_boot_zone_redhat lx_boot_zone_ubuntu lx_boot_zone_debian PROGS += lx_boot_zone_busybox lx_boot_zone_suse lx_boot_zone_docker +PROGS += lx_boot_zone_void XMLDOCS = config.xml platform.xml TEMPLATES = SUNWlx.xml SUNWlx26.xml diff --git a/usr/src/lib/brand/lx/zone/lx_boot.ksh b/usr/src/lib/brand/lx/zone/lx_boot.ksh index da93e03733..7361e45b52 100644 --- a/usr/src/lib/brand/lx/zone/lx_boot.ksh +++ b/usr/src/lib/brand/lx/zone/lx_boot.ksh @@ -21,8 +21,8 @@ # # # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright 2015, Joyent, Inc. # Copyright 2017 ASS-Einrichtungssysteme GmbH, Inc. +# Copyright 2020 Joyent, Inc. # # lx boot script. # @@ -83,6 +83,8 @@ elif [[ -f $ZONEROOT/etc/alpine-release ]]; then distro="busybox" elif [[ -f $ZONEROOT/etc/SuSE-release ]]; then distro="suse" +elif [[ -f $ZONEROOT/etc/void-release ]]; then + distro="void" fi [[ -z $distro ]] && fatal "Unsupported distribution!" diff --git a/usr/src/lib/brand/lx/zone/lx_boot_zone_void.ksh b/usr/src/lib/brand/lx/zone/lx_boot_zone_void.ksh new file mode 100755 index 0000000000..df7218ca21 --- /dev/null +++ b/usr/src/lib/brand/lx/zone/lx_boot_zone_void.ksh @@ -0,0 +1,17 @@ +#!/bin/ksh -p +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2020 Joyent, Inc. +# + +# Hand control back to lx_boot |