Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-04 23:01:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.677

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-07-19 03:54:47 +00:00
parent 2d7a0928eb
commit a63c7fd637
37 changed files with 174 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
debian/changelog vendored
View File

@ -1,3 +1,29 @@
livecd-rootfs (2.677) groovy; urgency=medium
* Avoid rbind /sys for chroot snap pre-seeding (cgroups fail to unmount)
-- Robert C Jennings <robert.jennings@canonical.com> Sat, 18 Jul 2020 16:51:05 -0500
livecd-rootfs (2.676) groovy; urgency=medium
* apparmor: Add generic v5.4 kernel apparmor features
* apparmor: mount more up-to-date apparmor features in the chroot.
* seccomp: add more up-to-date seccomp actions
* seccomp: mount more up-to-date seccomp features
* apparmor: compile all profiles
-- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 18 Jul 2020 01:17:54 +0100
livecd-rootfs (2.675) groovy; urgency=medium
[ Robert C Jennings ]
* Apply snap-preseed optimizations after seeding snaps
[ Dimitri John Ledkov ]
* live-server: remove duplicate snaps, due to overlayfs vs snap-preseed.
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 17 Jul 2020 21:19:35 +0100
livecd-rootfs (2.674) groovy; urgency=medium
[ David Krauser ]

78
live-build/apparmor/generic.features Normal file
View File

@ -0,0 +1,78 @@
query {label {multi_transaction {yes
}
data {yes
}
perms {allow deny audit quiet
}
}
}
dbus {mask {acquire send receive
}
}
signal {mask {hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm term stkflt chld cont stop stp ttin ttou urg xcpu xfsz vtalrm prof winch io pwr sys emt lost
}
}
ptrace {mask {read trace
}
}
caps {mask {chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm block_suspend audit_read
}
}
rlimit {mask {cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime
}
}
capability {0xffffff
}
namespaces {pivot_root {no
}
profile {yes
}
}
mount {mask {mount umount pivot_root
}
}
network {af_unix {yes
}
af_mask {unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp
}
}
network_v8 {af_mask {unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp
}
}
file {mask {create read write exec append mmap_exec link lock
}
}
domain {version {1.2
}
attach_conditions {xattr {yes
}
}
computed_longest_left {yes
}
post_nnp_subset {yes
}
fix_binfmt_elf_mmap {yes
}
stack {yes
}
change_profile {yes
}
change_onexec {yes
}
change_hatv {yes
}
change_hat {yes
}
}
policy {set_load {yes
}
versions {v8 {yes
}
v7 {yes
}
v6 {yes
}
v5 {yes
}
}
}

1
live-build/apparmor/generic/capability Normal file
View File

@ -0,0 +1 @@
0xffffff

1
live-build/apparmor/generic/caps/mask Normal file
View File

@ -0,0 +1 @@
chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm block_suspend audit_read

1
live-build/apparmor/generic/dbus/mask Normal file
View File

@ -0,0 +1 @@
acquire send receive

1
live-build/apparmor/generic/domain/attach_conditions/xattr Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/domain/change_hat Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/domain/change_hatv Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/domain/change_onexec Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/domain/change_profile Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/domain/computed_longest_left Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/domain/fix_binfmt_elf_mmap Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/domain/post_nnp_subset Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/domain/stack Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/domain/version Normal file
View File

@ -0,0 +1 @@
1.2

1
live-build/apparmor/generic/file/mask Normal file
View File

@ -0,0 +1 @@
create read write exec append mmap_exec link lock

1
live-build/apparmor/generic/mount/mask Normal file
View File

@ -0,0 +1 @@
mount umount pivot_root

1
live-build/apparmor/generic/namespaces/pivot_root Normal file
View File

@ -0,0 +1 @@
no

1
live-build/apparmor/generic/namespaces/profile Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/network/af_mask Normal file
View File

@ -0,0 +1 @@
unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp

1
live-build/apparmor/generic/network/af_unix Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/network_v8/af_mask Normal file
View File

@ -0,0 +1 @@
unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp

1
live-build/apparmor/generic/policy/set_load Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/policy/versions/v5 Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/policy/versions/v6 Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/policy/versions/v7 Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/policy/versions/v8 Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/ptrace/mask Normal file
View File

@ -0,0 +1 @@
read trace

1
live-build/apparmor/generic/query/label/data Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/query/label/multi_transaction Normal file
View File

@ -0,0 +1 @@
yes

1
live-build/apparmor/generic/query/label/perms Normal file
View File

@ -0,0 +1 @@
allow deny audit quiet

1
live-build/apparmor/generic/rlimit/mask Normal file
View File

@ -0,0 +1 @@
cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime

1
live-build/apparmor/generic/signal/mask Normal file
View File

@ -0,0 +1 @@
hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm term stkflt chld cont stop stp ttin ttou urg xcpu xfsz vtalrm prof winch io pwr sys emt lost

19
live-build/auto/build
View File

@ -112,7 +112,26 @@ preinstall_snaps() {
for snap in "$@"; do
SNAP_NO_VALIDATE_SEED=1 snap_preseed chroot "${snap}"
done
if [ ! -c /dev/mem ]; then
mknod -m 660 /dev/mem c 1 1
chown root:kmem /dev/mem
fi
mount --rbind /dev chroot/dev
mount --bind /sys chroot/sys
mount --bind /sys/kernel/security chroot/sys/kernel/security
mount --bind /proc chroot/proc
# Provide more up to date apparmor features, matching target kernel
mount -o bind /usr/share/livecd-rootfs/live-build/apparmor/generic chroot/sys/kernel/security/apparmor/features
mount -o bind /usr/share/livecd-rootfs/live-build/seccomp/generic.actions_avail chroot/proc/sys/kernel/seccomp/actions_avail
snap_validate_seed chroot
umount --recursive chroot/proc
umount --recursive chroot/sys
umount --recursive chroot/dev
lb chroot_resolv remove
}

12
live-build/functions
View File

@ -90,9 +90,18 @@ mount_image() {
setup_mountpoint() {
local mountpoint="$1"
if [ ! -c /dev/mem ]; then
mknod -m 660 /dev/mem c 1 1
chown root:kmem /dev/mem
fi
mount --rbind /dev "$mountpoint/dev"
mount proc-live -t proc "$mountpoint/proc"
mount sysfs-live -t sysfs "$mountpoint/sys"
mount securityfs -t securityfs "$mountpoint/sys/kernel/security"
# Provide more up to date apparmor features, matching target kernel
mount -o bind /usr/share/livecd-rootfs/live-build/apparmor/generic "$mountpoint/sys/kernel/security/apparmor/features/"
mount -o bind /usr/share/livecd-rootfs/live-build/seccomp/generic.actions_avail "$mountpoint/proc/sys/kernel/seccomp/actions_avail"
mount -t tmpfs none "$mountpoint/tmp"
mount -t tmpfs none "$mountpoint/var/lib/apt"
mount -t tmpfs none "$mountpoint/var/cache/apt"
@ -687,6 +696,9 @@ snap_validate_seed() {
if [ -e "${CHROOT_ROOT}/var/lib/snapd/seed/seed.yaml" ]; then
snap debug validate-seed "${CHROOT_ROOT}/var/lib/snapd/seed/seed.yaml"
/usr/lib/snapd/snap-preseed --reset $(realpath "${CHROOT_ROOT}")
/usr/lib/snapd/snap-preseed $(realpath "${CHROOT_ROOT}")
chroot "${CHROOT_ROOT}" apparmor_parser --skip-read-cache --write-cache --skip-kernel-load --verbose -j `nproc` /etc/apparmor.d
fi
}

1
live-build/seccomp/generic.actions_avail Normal file
View File

@ -0,0 +1 @@
kill_process kill_thread trap errno user_notif trace log allow

9
live-build/ubuntu-server/hooks/032-installer-squashfs.binary
View File

@ -21,10 +21,9 @@ if [ -n "$SUBARCH" ]; then
exit 0
fi
. config/binary
. config/functions
. config/common
# somehow i don't have LB_DISTRIBUTION set ?!
. config/bootstrap
FILESYSTEM_ROOT=binary/boot/squashfs.dir
INSTALLER_ROOT=binary/boot/installer.squashfs.dir
@ -84,6 +83,12 @@ sed -i -e'N;/name: lxd/,+2d' $INSTALLER_ROOT/var/lib/snapd/seed/seed.yaml
teardown_mountpoint "$INSTALLER_ROOT"
# Drop core/lxd/snapd that got copied up from base layer, due to
# snap-preseed tool doing --reset & speedup
find $OVERLAY_ROOT/var/lib/snapd/ -name 'core*.snap' -delete
find $OVERLAY_ROOT/var/lib/snapd/ -name 'snapd_*.snap' -delete
find $OVERLAY_ROOT/var/lib/snapd/ -name 'lxd_*.snap' -delete
squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
create_squashfs "$OVERLAY_ROOT/" ${squashfs_f}