Skip to content

Commit a0cd763

Browse files
committed
solved
1 parent 6277861 commit a0cd763

File tree

4 files changed

+30
-111
lines changed

4 files changed

+30
-111
lines changed

mychroot/ci/debian-12.9-install.sh

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,43 +35,26 @@ apt update -y
3535
apt upgrade -y
3636

3737
# packages to be added for a minimum standard installation
38-
apt install \
39-
bash-completion \
40-
dialog \
41-
dnsutils \
42-
git \
43-
iproute2 \
44-
iputils-ping \
45-
less \
46-
locales \
47-
man \
48-
man-db \
49-
manpages \
50-
nano \
51-
net-tools \
52-
procps \
53-
sudo \
54-
systemd-sysv \
55-
tzdata \
56-
vim -y
57-
58-
# packages in naked but not in minimal
5938
apt install \
6039
apt-listchanges \
6140
apt-utils \
41+
bash-completion \
6242
cron \
6343
cron-daemon-common \
6444
debconf-i18n \
6545
debian-faq \
46+
dialog \
6647
dictionaries-common \
6748
discover \
6849
discover-data \
6950
distro-info-data \
51+
dnsutils \
7052
doc-debian \
7153
eject \
7254
emacsen-common \
7355
fdisk \
7456
file \
57+
git \
7558
grub-efi-amd64 \
7659
iamerican \
7760
ibritish \
@@ -80,12 +63,15 @@ apt install \
8063
inetutils-telnet \
8164
init \
8265
installation-report \
66+
iproute2 \
67+
iputils-ping \
8368
isc-dhcp-client \
8469
isc-dhcp-common \
8570
iso-codes \
8671
ispell \
8772
iucode-tool \
8873
laptop-detect \
74+
less \
8975
libdiscover2 \
9076
liblockfile-bin \
9177
libmagic-mgc \
@@ -100,16 +86,23 @@ apt install \
10086
libtext-wrapi18n-perl \
10187
liburing2 \
10288
libusb-1.0-0 \
89+
locales \
10390
logrotate \
10491
lsb-release \
10592
lsof \
10693
mailcap \
94+
man \
95+
man-db \
96+
manpages \
10797
mime-support \
98+
nano \
10899
ncurses-term \
100+
net-tools \
109101
netcat-traditional \
110102
nftables \
111103
pci.ids \
112104
pciutils \
105+
procps \
113106
python-apt-common \
114107
python3-apt \
115108
python3-certifi \
@@ -131,13 +124,17 @@ apt install \
131124
qemu-guest-agent \
132125
reportbug \
133126
sensible-utils \
127+
sudo \
128+
systemd-sysv \
134129
task-english \
135130
tasksel \
136131
tasksel-data \
137132
traceroute \
133+
tzdata \
138134
ucf \
139135
usbutils \
140136
util-linux-locales \
137+
vim \
141138
vim-tiny \
142139
wamerican \
143140
wget \

mychroot/ci/minimal.txt

Lines changed: 0 additions & 89 deletions
This file was deleted.

src/classes/ovary.d/bind-live-fs.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,20 @@ export async function bindLiveFs(this: Ovary) {
7575
* Directory
7676
*/
7777
} else if (statDir.isDirectory()) {
78+
79+
/**
80+
* boot and etc will be copied
81+
*/
7882
if (dir === 'boot') {
7983
cmds.push(`# /boot is copied actually`)
8084
cmds.push(await rexec(`cp -r /boot ${this.settings.config.snapshot_mnt}filesystem.squashfs`, this.verbose))
8185
}
8286

87+
if (dir === 'etc') {
88+
cmds.push(`# /etc is copied actually`)
89+
cmds.push(await rexec(`cp -r /etc ${this.settings.config.snapshot_mnt}filesystem.squashfs`, this.verbose))
90+
}
91+
8392
if (dir !== 'boot' && dir !== 'lost+found') {
8493
cmd = `# /${dir} is a directory`
8594
if (this.mergedAndOverlay(dir)) {

src/classes/ovary.d/merged.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export function merged(this: Ovary, dir: string): boolean {
3939
const noMergeDirs = [
4040
'boot', // will be copied now
4141
'cdrom',
42+
'etc', // copied
4243
'dev',
4344
'media',
4445
'mnt',
@@ -89,7 +90,8 @@ export function mergedAndOverlay(this: Ovary, dir: string): boolean {
8990
*/
9091

9192
// aggiunto bin per autologin su Alpine
92-
const mountDirs = ['etc', 'usr', 'var']
93+
// const mountDirs = ['etc', 'usr', 'var']
94+
const mountDirs = ['usr', 'var']
9395
let mountDir = ''
9496
let overlay = false
9597
for (mountDir of mountDirs) {

0 commit comments

Comments
 (0)