4803847e5e
* Remove the rw folder from the image after installing in KVM When the image is installed from within KVM and then loaded, some files (such as timer stamp files) are created as part of that bootup that then get into the final image. This can cause some side effects, such as systemd thinking that some persistent timers need to run because the last trigger time got missed. Therefore, at the end of the check_install.py script, remove the rw folder so that it doesn't exist in the image, and that when this image is started up in a KVM setup for the first time, it starts with a truly clean slate. Without this change, the issue seen was that for fstrim.timer, a stamp file would be present in /var/lib/systemd/timers (and for other timers that are marked as persistent). This would then cause fstrim.service to get started immediately when starting a QEMU setup if the timer for that service missed a trigger, and not wait 10 minutes after bootup. In the case of fstrim.timer, that means if the image was started in QEMU after next Monday, since that timer is scheduled to be triggered weekly. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Split installation of SONiC and test bootup into two separate scripts Just removing the rw directory causes other issues, since the first boot tasks no longer run since that file isn't present. Also, just recreating that file doesn't completely help, because there are some files that are moved from the /host folder into the base filesystem layer, and so are no longer available. Instead, split the installation of SONiC and doing the test bootup into two separate scripts and two separate KVM instances. The first KVM instance is the one currently being run, while the second one has the `-snapshot` flag added in, which means any changes to the disk image don't take effect. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
50 lines
1.0 KiB
Python
Executable File
50 lines
1.0 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
import argparse
|
|
import pexpect
|
|
import sys
|
|
import time
|
|
|
|
|
|
def main():
|
|
|
|
parser = argparse.ArgumentParser(description='test_login cmdline parser')
|
|
parser.add_argument('-p', type=int, default=9000, help='local port')
|
|
|
|
args = parser.parse_args()
|
|
|
|
#KEY_UP = '\x1b[A'
|
|
KEY_DOWN = '\x1b[B'
|
|
#KEY_RIGHT = '\x1b[C'
|
|
#KEY_LEFT = '\x1b[D'
|
|
|
|
grub_selection = "The highlighted entry will be executed"
|
|
|
|
i = 0
|
|
while True:
|
|
try:
|
|
p = pexpect.spawn("telnet 127.0.0.1 {}".format(args.p), timeout=600, logfile=sys.stdout, encoding='utf-8')
|
|
break
|
|
except Exception as e:
|
|
print(str(e))
|
|
i += 1
|
|
if i == 10:
|
|
raise
|
|
time.sleep(1)
|
|
|
|
# select ONIE embed
|
|
p.expect(grub_selection)
|
|
p.sendline(KEY_DOWN)
|
|
|
|
# select ONIE install
|
|
p.expect(['ONIE: Install OS'])
|
|
p.expect([grub_selection])
|
|
p.sendline()
|
|
|
|
# wait for grub, and exit
|
|
p.expect([grub_selection])
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|