mirror of
https://github.com/ostreedev/ostree.git
synced 2025-01-09 01:18:35 +03:00
parallel-debian: Support being run as non-root
This commit is contained in:
Colin Walters
parent
4a17c659b8
commit
1103284645
1
parallel-debian/.gitignore
vendored
1
parallel-debian/.gitignore
vendored
@ -1,2 +1 @@
|
||||
chroot_break
|
||||
ostree_switch_root
|
||||
|
||||
@ -1,8 +1,4 @@
|
||||
|
||||
all: ostree_switch_root chroot_break
|
||||
all: ostree_switch_root
|
||||
|
||||
ostree_switch_root: ostree_switch_root.c Makefile
|
||||
gcc -Wall -o $@ $<
|
||||
|
||||
chroot_break: chroot_break.c Makefile
|
||||
gcc -Wall -o $@ $<
|
||||
|
||||
@ -1,117 +0,0 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
|
||||
*
|
||||
* chroot_break: Exit out of active chroot(2) if any. Requires root privileges.
|
||||
*
|
||||
* Copyright (C) 2011 Colin Walters <walters@verbum.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#define _GNU_SOURCE
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
#include <dirent.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
int
|
||||
usage (const char *self,
|
||||
int ecode)
|
||||
{
|
||||
fprintf (stderr, "usage: %s PROGRAM [ARGS...]\n", self);
|
||||
|
||||
return ecode;
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc,
|
||||
char **argv)
|
||||
{
|
||||
const char *template = "/tmp/chroot.XXXXXX";
|
||||
char *tmpdir;
|
||||
DIR *tmp;
|
||||
struct stat current;
|
||||
struct stat up;
|
||||
|
||||
if (argc < 2)
|
||||
return usage (argv[0], 1);
|
||||
|
||||
tmpdir = strdup (template);
|
||||
if (!mkdtemp (tmpdir))
|
||||
{
|
||||
perror ("mkdtemp");
|
||||
return 1;
|
||||
}
|
||||
|
||||
tmp = opendir ("/tmp");
|
||||
if (!tmp)
|
||||
{
|
||||
perror ("opening /tmp");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (chroot (tmpdir) < 0)
|
||||
{
|
||||
perror ("chroot into tempdir");
|
||||
return 1;
|
||||
}
|
||||
|
||||
do
|
||||
{
|
||||
if (stat (".", ¤t) < 0)
|
||||
{
|
||||
perror ("stat");
|
||||
return 1;
|
||||
}
|
||||
if (stat ("..", &up) < 0)
|
||||
{
|
||||
perror ("stat");
|
||||
return 1;
|
||||
}
|
||||
if (current.st_dev == up.st_dev
|
||||
&& current.st_ino == up.st_ino)
|
||||
break;
|
||||
if (chdir ("..") < 0)
|
||||
{
|
||||
perror ("chdir");
|
||||
return 1;
|
||||
}
|
||||
} while (1);
|
||||
|
||||
if (chroot (".") < 0)
|
||||
{
|
||||
perror ("chroot into real root");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (unlinkat (dirfd (tmp), strrchr (tmpdir, '/') + 1, AT_REMOVEDIR) < 0)
|
||||
{
|
||||
perror ("cleaning up tmpdir");
|
||||
return 1;
|
||||
}
|
||||
|
||||
closedir (tmp);
|
||||
|
||||
if (execv (argv[1], &argv[1]) < 0)
|
||||
{
|
||||
perror ("Running child process");
|
||||
return 1;
|
||||
}
|
||||
/* Should not be reached */
|
||||
return 1;
|
||||
}
|
||||
@ -5,31 +5,31 @@
|
||||
set -e
|
||||
set -x
|
||||
|
||||
echo gnomeos > /etc/hostname
|
||||
echo gnomeos >./etc/hostname
|
||||
|
||||
cat > /etc/default/locale <<EOF
|
||||
cat >./etc/default/locale <<EOF
|
||||
LANG="en_US.UTF-8"
|
||||
EOF
|
||||
|
||||
cp -p /usr/share/sysvinit/inittab /etc/inittab
|
||||
cp -p /usr/share/base-files/nsswitch.conf /etc/nsswitch.conf
|
||||
cp -p ./usr/share/sysvinit/inittab ./etc/inittab
|
||||
cp -p ./usr/share/base-files/nsswitch.conf ./etc/nsswitch.conf
|
||||
|
||||
cat >/etc/pam.d/common-account <<EOF
|
||||
cat >./etc/pam.d/common-account <<EOF
|
||||
account [success=1 new_authtok_reqd=done default=ignore] pam_unix.so
|
||||
account requisite pam_deny.so
|
||||
account required pam_permit.so
|
||||
EOF
|
||||
cat >/etc/pam.d/common-auth <<EOF
|
||||
cat >./etc/pam.d/common-auth <<EOF
|
||||
auth [success=1 default=ignore] pam_unix.so nullok_secure
|
||||
auth requisite pam_deny.so
|
||||
auth required pam_permit.so
|
||||
EOF
|
||||
cat >/etc/pam.d/common-password <<EOF
|
||||
cat >./etc/pam.d/common-password <<EOF
|
||||
password [success=1 default=ignore] pam_unix.so obscure sha512
|
||||
password requisite pam_deny.so
|
||||
password required pam_permit.so
|
||||
EOF
|
||||
cat >/etc/pam.d/common-session <<EOF
|
||||
cat >./etc/pam.d/common-session <<EOF
|
||||
session [default=1] pam_permit.so
|
||||
session requisite pam_deny.so
|
||||
session required pam_permit.so
|
||||
@ -37,14 +37,8 @@ session required pam_unix.so
|
||||
EOF
|
||||
|
||||
# base-passwd
|
||||
cp -p /usr/share/base-passwd/passwd.master /etc/passwd
|
||||
cp -p /usr/share/base-passwd/group.master /etc/group
|
||||
|
||||
# From debian-installer user-setup
|
||||
shadowconfig on
|
||||
chpasswd <<EOF
|
||||
root:root
|
||||
EOF
|
||||
cp -p ./usr/share/base-passwd/passwd.master ./etc/passwd
|
||||
cp -p ./usr/share/base-passwd/group.master ./etc/group
|
||||
|
||||
# Service rc.d defaults
|
||||
setuprc () {
|
||||
@ -56,8 +50,7 @@ setuprc () {
|
||||
shift
|
||||
|
||||
for x in $@; do
|
||||
cd /etc/rc${x}.d
|
||||
ln -s ../init.d/$name ${type}${priority}${name}
|
||||
ln -s ../init.d/$name ./etc/rc${x}.d/${type}${priority}${name}
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ set -x
|
||||
SRCDIR=`dirname $0`
|
||||
WORKDIR=`pwd`
|
||||
|
||||
DEPENDS="debootstrap qemu-img grubby"
|
||||
DEPENDS="debootstrap"
|
||||
|
||||
for x in $DEPENDS; do
|
||||
if ! command -v $x; then
|
||||
@ -35,13 +35,6 @@ EOF
|
||||
fi
|
||||
done
|
||||
|
||||
if test $(id -u) != 0; then
|
||||
cat <<EOF
|
||||
This script must be run as root.
|
||||
EOF
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test -z "${OSTREE}"; then
|
||||
OSTREE=`command -v ostree || true`
|
||||
fi
|
||||
@ -163,10 +156,8 @@ if ! test -d ${OBJ}; then
|
||||
cd ${OBJ}.tmp/ostree;
|
||||
rm -rf worktree
|
||||
$OSTREE --repo=repo checkout gnomeos worktree
|
||||
cp ${SRCDIR}/debian-setup.sh worktree
|
||||
chroot worktree ./debian-setup.sh
|
||||
rm worktree/debian-setup.sh
|
||||
cd worktree;
|
||||
cd worktree
|
||||
${SRCDIR}/debian-setup.sh
|
||||
$OSTREE --repo=../repo commit -b gnomeos -s "Run debian-setup.sh"
|
||||
cd ..
|
||||
rm -rf worktree
|
||||
Loading…
Reference in New Issue
Block a user