From 2ad2c18f4346229fca5cb5f7695a33c1194013cb Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 3 Aug 2019 10:35:24 -0600 Subject: [PATCH] configs/sim/include/etc.tar.gz, nsh_romfsimg.h: Improve the format of the /etc/passwd format. It is now a little similar to other systems. Add an /etc/group file to support future testing. --- configs/sim/include/etc.tar.gz | Bin 324 -> 373 bytes configs/sim/include/nsh_romfsimg.h | 69 ++++++++++++++--------------- 2 files changed, 33 insertions(+), 36 deletions(-) diff --git a/configs/sim/include/etc.tar.gz b/configs/sim/include/etc.tar.gz index 0e598a66d45abba4c51d17575cd337a1f15639e0..c5ebe3168d77890383027afef4e44d486e88619d 100644 GIT binary patch literal 373 zcmV-*0gC<~iwFohu0>q{17&n$E_7jX0PWUKPlGTR25`=NiZ}75PTE4L;b!JRKlYqpJYD@~Mdq%|aNEG2)_)O4N<}gXyZRSQajgGi_?Ew2 z%!e7H&p-M(e=g(w{AJr5>;DMOXlhgKQquHv^LTqde;{2L%FCv3lsVFl0+(05pRcT; zNlt<$HAyarx7&96bgA94rog1@!0KH1+ny6g>t)yX^ZE8G$NpQ`*VTWe>w05`8)IAl z2hM*{xI6!eu&aO06zYEr{fRHReqLYPz2r8mX2#6l-205JHq-W0$dUj>3jhEB00000 T00000a7sP^=d12V04M+eJy*h_ literal 324 zcmV-K0lWSmiwFoaS)o<{17&n$E_7jX0PWPlO2aT52JoKy6o2q2wMmvVUS%E>=f(K~ zacQBB)Y7IM`1Ga@nGU9S$Yl8aE`>B{QoepI{VGo)V}aHxVFlw_@!fSN;i8aQOC^~| z7-xkp5>l}bHW_+vI-;a+2W!5W_tX6oRfhcQruG*$-e>Tu{AXbv7ff^He+-}U?^eq= zd%Wi_59iNSv7f&R(}~47&R73D|1+9*rST;hdbqm3zFpptX)L*yq489EGM;kp+B9|R z&Qj(`P}Y;;f;ba0j8?{1J>|9>^UgStZdYcW#%fyoF}{7uU%xHvoBH3HzTen*drTcK zq&)op51kMFS1i;%{064}bI#HKV=&g$4P8Et=QmHTo3#sTm(Tun!Pc8O>Iwh=00000 W000000001RI^F;lAkLcrC;$L^ADpxR diff --git a/configs/sim/include/nsh_romfsimg.h b/configs/sim/include/nsh_romfsimg.h index 23895b27b45..5a623333e29 100644 --- a/configs/sim/include/nsh_romfsimg.h +++ b/configs/sim/include/nsh_romfsimg.h @@ -1,44 +1,43 @@ -const unsigned char romfs_img[] = -{ - 0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x01, 0x90, - 0xf3, 0x09, 0x03, 0xc1, 0x53, 0x69, 0x6d, 0x45, 0x74, 0x63, 0x56, 0x6f, +const unsigned char romfs_img[] = { + 0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x01, 0xe0, + 0xbf, 0xed, 0xd6, 0xc0, 0x53, 0x69, 0x6d, 0x45, 0x74, 0x63, 0x56, 0x6f, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0xd1, 0xff, 0xff, 0x97, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0xd1, 0xd1, 0xff, 0x80, 0x2e, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x59, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, - 0x68, 0x2d, 0x94, 0xb3, 0x69, 0x6e, 0x69, 0x74, 0x2e, 0x64, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, - 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0xd1, 0xff, 0xff, 0x00, - 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x20, - 0x00, 0x00, 0x00, 0x00, 0xd1, 0xd1, 0xff, 0x20, 0x2e, 0x2e, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, - 0x8d, 0x9c, 0xac, 0x88, 0x72, 0x63, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x20, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x20, 0x61, 0x20, 0x52, 0x41, 0x4d, 0x44, 0x49, - 0x53, 0x4b, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x20, 0x69, 0x74, 0x20, 0x61, 0x74, 0x20, 0x2f, 0x74, 0x6d, 0x70, 0x0a, - 0x0a, 0x6d, 0x6b, 0x72, 0x64, 0x20, 0x2d, 0x6d, 0x20, 0x32, 0x20, 0x2d, - 0x73, 0x20, 0x35, 0x31, 0x32, 0x20, 0x31, 0x30, 0x32, 0x34, 0x0a, 0x6d, - 0x6b, 0x66, 0x61, 0x74, 0x66, 0x73, 0x20, 0x2f, 0x64, 0x65, 0x76, 0x2f, - 0x72, 0x61, 0x6d, 0x32, 0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x2d, - 0x74, 0x20, 0x76, 0x66, 0x61, 0x74, 0x20, 0x2f, 0x64, 0x65, 0x76, 0x2f, - 0x72, 0x61, 0x6d, 0x32, 0x20, 0x2f, 0x74, 0x6d, 0x70, 0x0a, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, - 0x18, 0x3a, 0x8c, 0x6e, 0x70, 0x61, 0x73, 0x73, 0x77, 0x64, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x64, 0x6d, 0x69, - 0x6e, 0x20, 0x38, 0x54, 0x76, 0x2b, 0x48, 0x62, 0x6d, 0x72, 0x33, 0x70, - 0x4c, 0x64, 0x64, 0x53, 0x6a, 0x74, 0x7a, 0x4c, 0x30, 0x6b, 0x77, 0x43, - 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, + 0x28, 0x8d, 0x8f, 0xcd, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6f, 0x6f, 0x74, + 0x3a, 0x2a, 0x3a, 0x30, 0x3a, 0x72, 0x6f, 0x6f, 0x74, 0x2c, 0x61, 0x64, + 0x6d, 0x69, 0x6e, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x99, 0x00, 0x00, 0x00, 0xc0, + 0x00, 0x00, 0x00, 0x00, 0x68, 0x2d, 0x94, 0x33, 0x69, 0x6e, 0x69, 0x74, + 0x2e, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0xd1, 0xff, 0xfe, 0x80, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0xd1, 0xd1, 0xfe, 0xe0, + 0x2e, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x6e, 0x8d, 0x9c, 0xac, 0x88, 0x72, 0x63, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x23, 0x20, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x61, 0x20, 0x52, + 0x41, 0x4d, 0x44, 0x49, 0x53, 0x4b, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x69, 0x74, 0x20, 0x61, 0x74, 0x20, 0x2f, + 0x74, 0x6d, 0x70, 0x0a, 0x0a, 0x6d, 0x6b, 0x72, 0x64, 0x20, 0x2d, 0x6d, + 0x20, 0x32, 0x20, 0x2d, 0x73, 0x20, 0x35, 0x31, 0x32, 0x20, 0x31, 0x30, + 0x32, 0x34, 0x0a, 0x6d, 0x6b, 0x66, 0x61, 0x74, 0x66, 0x73, 0x20, 0x2f, + 0x64, 0x65, 0x76, 0x2f, 0x72, 0x61, 0x6d, 0x32, 0x0a, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x20, 0x2d, 0x74, 0x20, 0x76, 0x66, 0x61, 0x74, 0x20, 0x2f, + 0x64, 0x65, 0x76, 0x2f, 0x72, 0x61, 0x6d, 0x32, 0x20, 0x2f, 0x74, 0x6d, + 0x70, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x23, 0x18, 0x3a, 0x8c, 0x60, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x3a, 0x38, 0x54, 0x76, 0x2b, 0x48, 0x62, + 0x6d, 0x72, 0x33, 0x70, 0x4c, 0x64, 0x64, 0x53, 0x6a, 0x74, 0x7a, 0x4c, + 0x30, 0x6b, 0x77, 0x43, 0x3a, 0x30, 0x3a, 0x30, 0x3a, 0x2f, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -87,6 +86,4 @@ const unsigned char romfs_img[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - const unsigned int romfs_img_len = 1024; -