Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-devel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
143
Issues
143
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
emulab
emulab-devel
Commits
fc14d6df
Commit
fc14d6df
authored
Jun 29, 2018
by
David Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Ubuntu 18 Moonshot "support" (mostly just diff passwd files).
parent
080bf584
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
288 additions
and
1 deletion
+288
-1
clientside/configure
clientside/configure
+1
-0
clientside/configure.ac
clientside/configure.ac
+1
-0
clientside/tmcc/GNUmakefile.in
clientside/tmcc/GNUmakefile.in
+3
-0
clientside/tmcc/osstuff.sh
clientside/tmcc/osstuff.sh
+3
-1
clientside/tmcc/ubuntu18-ms/99-emulab
clientside/tmcc/ubuntu18-ms/99-emulab
+1
-0
clientside/tmcc/ubuntu18-ms/GNUmakefile.in
clientside/tmcc/ubuntu18-ms/GNUmakefile.in
+101
-0
clientside/tmcc/ubuntu18-ms/group
clientside/tmcc/ubuntu18-ms/group
+58
-0
clientside/tmcc/ubuntu18-ms/gshadow
clientside/tmcc/ubuntu18-ms/gshadow
+58
-0
clientside/tmcc/ubuntu18-ms/passwd
clientside/tmcc/ubuntu18-ms/passwd
+30
-0
clientside/tmcc/ubuntu18-ms/shadow
clientside/tmcc/ubuntu18-ms/shadow
+30
-0
configure
configure
+1
-0
configure.ac
configure.ac
+1
-0
No files found.
clientside/configure
View file @
fc14d6df
...
...
@@ -4617,6 +4617,7 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/ubuntu16/GNUmakefile
\
tmcc/ubuntu16-ms/GNUmakefile
\
tmcc/ubuntu18/GNUmakefile
\
tmcc/ubuntu18-ms/GNUmakefile
\
tmcc/linux-ms/GNUmakefile
\
tmcc/archlinux/GNUmakefile
\
tmcc/alpine/GNUmakefile
\
...
...
clientside/configure.ac
View file @
fc14d6df
...
...
@@ -305,6 +305,7 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/ubuntu16/GNUmakefile \
tmcc/ubuntu16-ms/GNUmakefile \
tmcc/ubuntu18/GNUmakefile \
tmcc/ubuntu18-ms/GNUmakefile \
tmcc/linux-ms/GNUmakefile \
tmcc/archlinux/GNUmakefile \
tmcc/alpine/GNUmakefile \
...
...
clientside/tmcc/GNUmakefile.in
View file @
fc14d6df
...
...
@@ -96,6 +96,9 @@ endif
ifeq ($(MDSUBDIR),redhat9)
MDSUBDIR = linux9
endif
ifeq ($(MDSUBDIR),MoonshotUbuntu18)
MDSUBDIR = ubuntu18-ms
endif
ifeq ($(MDSUBDIR),MoonshotUbuntu16)
MDSUBDIR = ubuntu16-ms
endif
...
...
clientside/tmcc/osstuff.sh
View file @
fc14d6df
...
...
@@ -137,7 +137,9 @@ Linux)
rel
=
1.0
# XXX probably wrong
fi
if
[
"
$dist
"
=
"Ubuntu"
-a
`
uname
-m
`
=
"aarch64"
]
;
then
if
[
"
$rel
"
=
"16.04"
]
;
then
if
[
"
$rel
"
=
"18.04"
]
;
then
tag
=
MoonshotUbuntu18
elif
[
"
$rel
"
=
"16.04"
]
;
then
tag
=
MoonshotUbuntu16
else
tag
=
Moonshot
...
...
clientside/tmcc/ubuntu18-ms/99-emulab
0 → 100644
View file @
fc14d6df
setenv bootargs ${bootargs} root=/dev/sda1
clientside/tmcc/ubuntu18-ms/GNUmakefile.in
0 → 100644
View file @
fc14d6df
#
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
# This file is part of the Emulab network testbed software.
#
# This file is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at
# your option) any later version.
#
# This file is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
# License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
# }}}
#
#
# XXX ONLY RUN THIS INSTALL ON AN UBUNTU LINUX TESTBED NODE!
#
# Trivial. These things just need to be installed into the right place
# on a testbed node before cutting an image.
#
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
include $(OBJDIR)/Makeconf
SCRIPTS =
#
# Force dependencies on the scripts so that they will be rerun through
# configure if the .in file is changed.
#
all: supfile ifcfgs
include $(TESTBED_SRCDIR)/GNUmakerules
SYSETCDIR = $(DESTDIR)/etc
ETCDIR = $(DESTDIR)$(CLIENT_ETCDIR)
BINDIR = $(DESTDIR)$(CLIENT_BINDIR)
VARDIR = $(DESTDIR)$(CLIENT_VARDIR)
RCDIR = $(SYSETCDIR)
RRCDIR = /etc
INSTALL = /usr/bin/install -c
COMMON = $(SRCDIR)/../common
DEFRUNLVLDIR ?= $(SYSETCDIR)/rc3.d
install client-install: common-install etc-install \
script-install bin-install sysetc-fixup sysetc-install \
systemd-install
@echo "Remember to install the PEM files if necessary"
simple-install: common-install script-install bin-install
dir-install:
(cd ../ubuntu18; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) dir-install)
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/flash-kernel
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/flash-kernel/ubootenv.d
common-install: dir-install
(cd ../common; $(MAKE) DESTDIR=$(DESTDIR) local-install)
bin-install: dir-install
(cd ../ubuntu18; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) bin-install)
etc-install: dir-install common-sysetc-install
(cd ../ubuntu18; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) etc-install)
$(INSTALL) -m 644 $(SRCDIR)/group $(ETCDIR)/group
$(INSTALL) -m 644 $(SRCDIR)/passwd $(ETCDIR)/passwd
$(INSTALL) -m 600 $(SRCDIR)/shadow $(ETCDIR)/shadow
$(INSTALL) -m 600 $(SRCDIR)/gshadow $(ETCDIR)/gshadow
common-sysetc-install: dir-install
(cd ../ubuntu18; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) common-sysetc-install)
sysetc-fixup:
(cd ../ubuntu18; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) sysetc-fixup)
sysetc-install: dir-install
(cd ../ubuntu18; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) sysetc-install)
$(INSTALL) -m 644 $(SRCDIR)/99-emulab $(SYSETCDIR)/flash-kernel/ubootenv.d/99-emulab
systemd-install: dir-install
(cd ../ubuntu18; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) systemd-install)
script-install: dir-install $(SCRIPTS)
(cd ../ubuntu18; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) script-install)
genirack-install:
sfs-install:
clientside/tmcc/ubuntu18-ms/group
0 → 100644
View file @
fc14d6df
root:x:0:
daemon:x:1:
bin:x:2:
sys:x:3:
adm:x:4:syslog
tty:x:5:
disk:x:6:
lp:x:7:
mail:x:8:
news:x:9:
uucp:x:10:
man:x:12:
proxy:x:13:
kmem:x:15:
dialout:x:20:
fax:x:21:
voice:x:22:
cdrom:x:24:
floppy:x:25:
tape:x:26:
sudo:x:27:
audio:x:29:
dip:x:30:
www-data:x:33:
backup:x:34:
operator:x:37:
list:x:38:
irc:x:39:
src:x:40:
gnats:x:41:
shadow:x:42:
utmp:x:43:
video:x:44:
sasl:x:45:
plugdev:x:46:
staff:x:50:
games:x:60:
users:x:100:
nogroup:x:65534:
systemd-journal:x:101:
systemd-timesync:x:102:
systemd-network:x:103:
systemd-resolve:x:104:
input:x:106:
crontab:x:107:
syslog:x:108:
netdev:x:109:
messagebus:x:110:
uuidd:x:111:
mlocate:x:112:
ssh:x:113:
_cvsadmin:x:114:
ntp:x:115:
scanner:x:116:
colord:x:117:
ssl-cert:x:118:
postfix:x:105:
postdrop:x:119:
clientside/tmcc/ubuntu18-ms/gshadow
0 → 100644
View file @
fc14d6df
root:*::
daemon:*::
bin:*::
sys:*::
adm:*::syslog
tty:*::
disk:*::
lp:*::
mail:*::
news:*::
uucp:*::
man:*::
proxy:*::
kmem:*::
dialout:*::
fax:*::
voice:*::
cdrom:*::
floppy:*::
tape:*::
sudo:*::
audio:*::
dip:*::
www-data:*::
backup:*::
operator:*::
list:*::
irc:*::
src:*::
gnats:*::
shadow:*::
utmp:*::
video:*::
sasl:*::
plugdev:*::
staff:*::
games:*::
users:*::
nogroup:*::
systemd-journal:!::
systemd-timesync:!::
systemd-network:!::
systemd-resolve:!::
input:!::
crontab:!::
syslog:!::
netdev:!::
messagebus:!::
uuidd:!::
mlocate:!::
ssh:!::
_cvsadmin:!::
ntp:!::
scanner:!::
colord:!::
ssl-cert:!::
postfix:!::
postdrop:!::
clientside/tmcc/ubuntu18-ms/passwd
0 → 100644
View file @
fc14d6df
root:x:0:0:root:/root:/bin/bash
daemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin
bin:x:2:2:bin:/bin:/usr/sbin/nologin
sys:x:3:3:sys:/dev:/usr/sbin/nologin
sync:x:4:65534:sync:/bin:/bin/sync
games:x:5:60:games:/usr/games:/usr/sbin/nologin
man:x:6:12:man:/var/cache/man:/usr/sbin/nologin
lp:x:7:7:lp:/var/spool/lpd:/usr/sbin/nologin
mail:x:8:8:mail:/var/mail:/usr/sbin/nologin
news:x:9:9:news:/var/spool/news:/usr/sbin/nologin
uucp:x:10:10:uucp:/var/spool/uucp:/usr/sbin/nologin
proxy:x:13:13:proxy:/bin:/usr/sbin/nologin
www-data:x:33:33:www-data:/var/www:/usr/sbin/nologin
backup:x:34:34:backup:/var/backups:/usr/sbin/nologin
list:x:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin
irc:x:39:39:ircd:/var/run/ircd:/usr/sbin/nologin
gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/usr/sbin/nologin
nobody:x:65534:65534:nobody:/nonexistent:/usr/sbin/nologin
systemd-timesync:x:100:102:systemd Time Synchronization,,,:/run/systemd:/bin/false
systemd-network:x:101:103:systemd Network Management,,,:/run/systemd/netif:/bin/false
systemd-resolve:x:102:104:systemd Resolver,,,:/run/systemd/resolve:/bin/false
syslog:x:104:108::/home/syslog:/bin/false
_apt:x:105:65534::/nonexistent:/bin/false
messagebus:x:106:110::/var/run/dbus:/bin/false
uuidd:x:107:111::/run/uuidd:/bin/false
sshd:x:108:65534::/var/run/sshd:/usr/sbin/nologin
ntp:x:109:115::/home/ntp:/bin/false
colord:x:110:117:colord colour management daemon,,,:/var/lib/colord:/bin/false
statd:x:111:65534::/var/lib/nfs:/bin/false
postfix:x:103:105::/var/spool/postfix:/usr/sbin/nologin
clientside/tmcc/ubuntu18-ms/shadow
0 → 100644
View file @
fc14d6df
root:$6$oVbtEIWC$TqOn/RqsXd9oWP05qPx8Sehp747uhl/1sFOtqOLkWQ3AVeWLF64xRCk3wLRlt8MtVbfw8xvQjVQF33qogjNGf.:17711:0:99999:7:::
daemon:*:16997:0:99999:7:::
bin:*:16997:0:99999:7:::
sys:*:16997:0:99999:7:::
sync:*:16997:0:99999:7:::
games:*:16997:0:99999:7:::
man:*:16997:0:99999:7:::
lp:*:16997:0:99999:7:::
mail:*:16997:0:99999:7:::
news:*:16997:0:99999:7:::
uucp:*:16997:0:99999:7:::
proxy:*:16997:0:99999:7:::
www-data:*:16997:0:99999:7:::
backup:*:16997:0:99999:7:::
list:*:16997:0:99999:7:::
irc:*:16997:0:99999:7:::
gnats:*:16997:0:99999:7:::
nobody:*:16997:0:99999:7:::
systemd-timesync:*:16997:0:99999:7:::
systemd-network:*:16997:0:99999:7:::
systemd-resolve:*:16997:0:99999:7:::
syslog:*:16997:0:99999:7:::
_apt:*:16997:0:99999:7:::
messagebus:*:16997:0:99999:7:::
uuidd:*:16997:0:99999:7:::
sshd:*:16997:0:99999:7:::
ntp:*:16997:0:99999:7:::
colord:*:16997:0:99999:7:::
statd:*:16997:0:99999:7:::
postfix:*:17711:0:99999:7:::
configure
View file @
fc14d6df
...
...
@@ -7203,6 +7203,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/tmcc/ubuntu16/GNUmakefile
\
clientside/tmcc/ubuntu16-ms/GNUmakefile
\
clientside/tmcc/ubuntu18/GNUmakefile
\
clientside/tmcc/ubuntu18-ms/GNUmakefile
\
clientside/tmcc/linux-ms/GNUmakefile
\
clientside/tmcc/archlinux/GNUmakefile
\
clientside/tmcc/alpine/GNUmakefile
\
...
...
configure.ac
View file @
fc14d6df
...
...
@@ -1524,6 +1524,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/tmcc/ubuntu16/GNUmakefile \
clientside/tmcc/ubuntu16-ms/GNUmakefile \
clientside/tmcc/ubuntu18/GNUmakefile \
clientside/tmcc/ubuntu18-ms/GNUmakefile \
clientside/tmcc/linux-ms/GNUmakefile \
clientside/tmcc/archlinux/GNUmakefile \
clientside/tmcc/alpine/GNUmakefile \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment