Imported using git-ubuntu import.
Changelog parent: a2210d3df2
New changelog entries:
* Add live-build/ubuntu-core/hooks/99zz-check-uid-gid.chroot, copy of
live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot with just the
error message changed. Currently, the passwd/group checks weren't run.
* live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early: also add input
group.
* Core: drop live-build/ubuntu-core/hooks/12-add-docker-user.chroot and move
docker user creation to
live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early; add ubuntu user
to docker group in
live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot. This fixes
static uid/gid maps for docker user/group.
* Update post-debootstrap hashes in
live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early.
impish
Loïc Minier
10 years ago
committed by
usd-importer
parent
a2210d3df2
commit
6c019ed452
@ -1,18 +0,0 @@
|
|||||||
#!/bin/sh -x
|
|
||||||
|
|
||||||
# FIXME: add click hook for user creation
|
|
||||||
|
|
||||||
USER=docker
|
|
||||||
|
|
||||||
echo "I: creating docker user"
|
|
||||||
|
|
||||||
addgroup --system --quiet $USER
|
|
||||||
adduser --system \
|
|
||||||
--ingroup $USER \
|
|
||||||
--disabled-login \
|
|
||||||
--shell /bin/false \
|
|
||||||
--no-create-home \
|
|
||||||
$USER
|
|
||||||
|
|
||||||
# ensure that the ubuntu user has the right group
|
|
||||||
adduser ubuntu docker
|
|
||||||
@ -0,0 +1,52 @@
|
|||||||
|
#!/bin/sh -eu
|
||||||
|
|
||||||
|
ERRCNT=""
|
||||||
|
|
||||||
|
passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1)
|
||||||
|
shadow_hash=$(set -- $(cat /etc/shadow | sed "s/:.*:0:99999:/:0:99999:/g" | md5sum) && echo $1)
|
||||||
|
group_length=$(cat /etc/group | wc -l)
|
||||||
|
gshadow_length=$(cat /etc/gshadow | wc -l)
|
||||||
|
|
||||||
|
passwd_orig_hash=$(set -- $(md5sum /etc/passwd.orig) && echo $1)
|
||||||
|
shadow_orig_hash=$(set -- $(cat /etc/shadow.orig | sed "s/:.*:0:99999:/:0:99999:/g" | md5sum) && echo $1)
|
||||||
|
group_orig_length=$(cat /etc/group.orig | wc -l)
|
||||||
|
gshadow_orig_length=$(cat /etc/gshadow.orig | wc -l)
|
||||||
|
|
||||||
|
if [ "$passwd_hash" != "$passwd_orig_hash" ]; then
|
||||||
|
echo "/etc/passwd has changed during setup." >&2
|
||||||
|
echo "The new /etc/passwd md5sum is: $passwd_hash" >&2
|
||||||
|
diff -Nrup /etc/passwd.orig /etc/passwd >&2 || true
|
||||||
|
ERRCNT=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$shadow_hash" != "$shadow_orig_hash" ]; then
|
||||||
|
echo "/etc/shadow has changed during setup." >&2
|
||||||
|
echo "The new /etc/shadow md5sum is: $shadow_hash" >&2
|
||||||
|
diff -Nrup /etc/shadow.orig /etc/shadow >&2 || true
|
||||||
|
ERRCNT=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$group_length" != "$group_orig_length" ]; then
|
||||||
|
echo "/etc/group has changed during setup." >&2
|
||||||
|
diff -Nrup /etc/group.orig /etc/group >&2 || true
|
||||||
|
ERRCNT=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$gshadow_length" != "$gshadow_orig_length" ]; then
|
||||||
|
echo "/etc/gshadow has changed during setup." >&2
|
||||||
|
diff -Nrup /etc/gshadow.orig /etc/gshadow >&2 || true
|
||||||
|
ERRCNT=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$ERRCNT" ]; then
|
||||||
|
echo "There were changes to the password database," >&2
|
||||||
|
echo "please adjust the values in the livecd-rootfs source in the file:" >&2
|
||||||
|
echo "live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early" >&2
|
||||||
|
echo >&2
|
||||||
|
echo "Please check also if a maintainer script of the package" >&2
|
||||||
|
echo "that added these entries perhaps created a home directory and," >&2
|
||||||
|
echo "if needed, add code for creation of it to the above hook" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm /etc/passwd.orig /etc/shadow.orig /etc/group.orig /etc/gshadow.orig
|
||||||
Loading…
Reference in new issue